Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-10-05 | 1 | -0/+6 |
|\ | |||||
| * | do not propagate channel deletion for an already deleted channel. | zotlabs | 2018-10-02 | 1 | -0/+6 |
| | | |||||
* | | move *_divmore_height setting to the module extra_settings, and fix issue ↵ | Mario Vavti | 2018-10-04 | 1 | -3/+9 |
| | | | | | | | | where feature settings were not synced if rpath was provided | ||||
* | | move *_list_mode to features | Mario Vavti | 2018-10-04 | 1 | -0/+16 |
| | | |||||
* | | jot: show settings icon only to local profile owner | Mario | 2018-10-03 | 1 | -1/+2 |
| | | |||||
* | | move archives from network to channel_home | Mario | 2018-10-03 | 1 | -8/+8 |
| | | |||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-10-03 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge branch 'dev' into 'dev' | M. Dent | 2018-10-03 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | Fix misplaced comma with period. See merge request hubzilla/core!1304 | ||||
| | * | | Fix misplaced comma with period. | M.Dent | 2018-10-02 | 1 | -1/+1 |
| | | | | |||||
* | | | | move filing from conversation to network - it is only functional there. | Mario Vavti | 2018-10-03 | 1 | -8/+8 |
|/ / / | |||||
* / / | indicate locked features | Mario Vavti | 2018-10-01 | 1 | -1/+1 |
|/ / | |||||
* | | Status editor hook | M. Dent | 2018-09-29 | 1 | -1/+15 |
| | | |||||
* | | Remove servicelevel logic | M. Dent | 2018-09-29 | 4 | -20/+3 |
| | | |||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2018-09-28 | 1 | -8/+13 |
|\ \ | |||||
| * | | settings for channel home | Mario Vavti | 2018-09-28 | 1 | -8/+13 |
| | | | |||||
* | | | nav_channel_select should be off by default | Mario | 2018-09-28 | 1 | -1/+1 |
|/ / | |||||
* | | Update zot.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | | |||||
* | | Update security.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| | | |||||
* | | Update zot.php | Max Kostikov | 2018-09-28 | 1 | -14/+14 |
| | | |||||
* | | Update group.php | Max Kostikov | 2018-09-28 | 1 | -21/+21 |
| | | |||||
* | | Update acl_selectors.php | Max Kostikov | 2018-09-27 | 1 | -1/+1 |
| | | |||||
* | | Update api_zot.php | Max Kostikov | 2018-09-27 | 1 | -4/+4 |
| | | |||||
* | | Update channel.php | Max Kostikov | 2018-09-27 | 1 | -5/+5 |
| | | |||||
* | | Update connections.php | Max Kostikov | 2018-09-27 | 1 | -2/+2 |
| | | |||||
* | | Update items.php | Max Kostikov | 2018-09-27 | 1 | -1/+1 |
| | | |||||
* | | Update security.php | Max Kostikov | 2018-09-27 | 1 | -1/+1 |
| | | |||||
* | | Update text.php | Max Kostikov | 2018-09-27 | 1 | -1/+1 |
| | | |||||
* | | Update xchan.php | Max Kostikov | 2018-09-27 | 1 | -1/+1 |
| | | |||||
* | | implement conversation tools (settings/conversation), remove additional ↵ | Mario Vavti | 2018-09-27 | 2 | -38/+30 |
| | | | | | | | | features from the settings menu and get rid of skill levels | ||||
* | | guest access app | Mario Vavti | 2018-09-26 | 1 | -15/+0 |
| | | |||||
* | | permcats app | Mario Vavti | 2018-09-26 | 1 | -9/+0 |
| | | |||||
* | | remove oauth from features | Mario Vavti | 2018-09-26 | 1 | -18/+0 |
| | | |||||
* | | appification of privacy groups | Mario Vavti | 2018-09-25 | 3 | -11/+2 |
| | | |||||
* | | get rid of general features | Mario Vavti | 2018-09-25 | 1 | -16/+0 |
| | | |||||
* | | move start_menu switch to settings/display for now | Mario Vavti | 2018-09-25 | 1 | -9/+0 |
| | | |||||
* | | premium channel app | Mario Vavti | 2018-09-25 | 1 | -9/+0 |
| | | |||||
* | | appification of notes | Mario Vavti | 2018-09-24 | 1 | -19/+0 |
| | | |||||
* | | move categories from tools to editor settings | Mario Vavti | 2018-09-24 | 1 | -9/+9 |
| | | |||||
* | | settings for directory and set App::$profile_uid in directory if local_channel() | Mario | 2018-09-24 | 1 | -9/+14 |
|/ | |||||
* | use different settings for cal_first_day in events and cdav/calendar. This ↵ | Mario | 2018-09-23 | 1 | -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 calendar | Mario | 2018-09-23 | 1 | -19/+44 |
| | |||||
* | provide settings for mod photo and make it slightly simpler to create new ↵ | Mario | 2018-09-23 | 1 | -11/+16 |
| | | | | module settings | ||||
* | keep the features in the central array but sort them by module name | Mario | 2018-09-23 | 1 | -144/+140 |
| | |||||
* | introduce profile settings and provide a way for modules without an app to ↵ | Mario | 2018-09-22 | 1 | -4/+12 |
| | | | | still be able to link to its settings page from the navbar | ||||
* | another try to fix Fix PHP Warning: DOMDocument::loadHTML(): ↵ | Mario Vavti | 2018-09-22 | 1 | -1/+4 |
| | | | | htmlParseEntityRef: no name in Entity | ||||
* | Revert "Fix PHP Warning: DOMDocument::loadHTML(): htmlParseEntityRef: no ↵ | Mario | 2018-09-22 | 1 | -2/+0 |
| | | | | | name in Entity" This reverts commit 184928204a264b231814b46ef294ef185dc0cdae | ||||
* | provide a return path from settings pages | Mario Vavti | 2018-09-21 | 1 | -0/+2 |
| | |||||
* | Merge branch 'dev' | zotlabs | 2018-09-20 | 3 | -3/+51 |
|\ | |||||
| * | move connection filtering setting from network to connections, provide a ↵ | Mario Vavti | 2018-09-20 | 2 | -3/+25 |
| | | | | | | | | link to settings in the navbar if present for a module and some code optimisation | ||||
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-09-20 | 1 | -0/+19 |
| |\ |