aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'patch-2' into 'dev'Mario2018-10-081-1/+3
|\ | | | | | | | | Prevent links damage on foreign channel repost for cloned See merge request hubzilla/core!1307
| * Prevent links damage on foreign channel repost for clonedMax Kostikov2018-10-051-1/+3
| |
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-10-071-1/+1
|\ \
| * | use hubloc_store_lowlevel to ensure all hubloc columns are initialisedzotlabs2018-10-061-1/+1
| | |
| * | Merge branch 'dev'zotlabs2018-10-0415-231/+149
| |\ \
* | \ \ Merge branch 'dev' into 'dev'M. Dent2018-10-071-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add missing else clause See merge request hubzilla/core!1317
| * | | | Add missing else clauseM.Dent2018-10-061-2/+3
| | | | |
* | | | | move profile assign selector to profile settings and personal menu selector ↵Mario Vavti2018-10-061-8/+19
|/ / / / | | | | | | | | | | | | to channel_home settings and get rid of misc channel settings section.
* | | / strings and force import_system_apps() on std_version changeMario Vavti2018-10-061-0/+5
| |_|/ |/| |
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-10-051-0/+6
|\| | | |/ |/|
| * do not propagate channel deletion for an already deleted channel.zotlabs2018-10-021-0/+6
| |
* | move *_divmore_height setting to the module extra_settings, and fix issue ↵Mario Vavti2018-10-041-3/+9
| | | | | | | | where feature settings were not synced if rpath was provided
* | move *_list_mode to featuresMario Vavti2018-10-041-0/+16
| |
* | jot: show settings icon only to local profile ownerMario2018-10-031-1/+2
| |
* | move archives from network to channel_homeMario2018-10-031-8/+8
| |
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-10-031-1/+1
|\ \
| * \ Merge branch 'dev' into 'dev'M. Dent2018-10-031-1/+1
| |\ \ | | | | | | | | | | | | | | | | Fix misplaced comma with period. See merge request hubzilla/core!1304
| | * | Fix misplaced comma with period.M.Dent2018-10-021-1/+1
| | | |
* | | | move filing from conversation to network - it is only functional there.Mario Vavti2018-10-031-8/+8
|/ / /
* / / indicate locked featuresMario Vavti2018-10-011-1/+1
|/ /
* | Status editor hookM. Dent2018-09-291-1/+15
| |
* | Remove servicelevel logicM. Dent2018-09-294-20/+3
| |
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2018-09-281-8/+13
|\ \
| * | settings for channel homeMario Vavti2018-09-281-8/+13
| | |
* | | nav_channel_select should be off by defaultMario2018-09-281-1/+1
|/ /
* | Update zot.phpMax Kostikov2018-09-281-1/+1
| |
* | Update security.phpMax Kostikov2018-09-281-1/+1
| |
* | Update zot.phpMax Kostikov2018-09-281-14/+14
| |
* | Update group.phpMax Kostikov2018-09-281-21/+21
| |
* | Update acl_selectors.phpMax Kostikov2018-09-271-1/+1
| |
* | Update api_zot.phpMax Kostikov2018-09-271-4/+4
| |
* | Update channel.phpMax Kostikov2018-09-271-5/+5
| |
* | Update connections.phpMax Kostikov2018-09-271-2/+2
| |
* | Update items.phpMax Kostikov2018-09-271-1/+1
| |
* | Update security.phpMax Kostikov2018-09-271-1/+1
| |
* | Update text.phpMax Kostikov2018-09-271-1/+1
| |
* | Update xchan.phpMax Kostikov2018-09-271-1/+1
| |
* | implement conversation tools (settings/conversation), remove additional ↵Mario Vavti2018-09-272-38/+30
| | | | | | | | features from the settings menu and get rid of skill levels
* | guest access appMario Vavti2018-09-261-15/+0
| |
* | permcats appMario Vavti2018-09-261-9/+0
| |
* | remove oauth from featuresMario Vavti2018-09-261-18/+0
| |
* | appification of privacy groupsMario Vavti2018-09-253-11/+2
| |
* | get rid of general featuresMario Vavti2018-09-251-16/+0
| |
* | move start_menu switch to settings/display for nowMario Vavti2018-09-251-9/+0
| |
* | premium channel appMario Vavti2018-09-251-9/+0
| |
* | appification of notesMario Vavti2018-09-241-19/+0
| |
* | move categories from tools to editor settingsMario Vavti2018-09-241-9/+9
| |
* | settings for directory and set App::$profile_uid in directory if local_channel()Mario2018-09-241-9/+14
|/
* use different settings for cal_first_day in events and cdav/calendar. This ↵Mario2018-09-231-2/+2
| | | | is a tradeoff. It would be better to have one setting for both but if we want to preserve the *all settings* view, this would break its functionality
* settings for events and cdav calendarMario2018-09-231-19/+44
|