Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'patch-2' into 'dev' | Mario | 2018-10-08 | 1 | -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 cloned | Max Kostikov | 2018-10-05 | 1 | -1/+3 |
| | | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-10-07 | 1 | -1/+1 |
|\ \ | |||||
| * | | use hubloc_store_lowlevel to ensure all hubloc columns are initialised | zotlabs | 2018-10-06 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'dev' | zotlabs | 2018-10-04 | 15 | -231/+149 |
| |\ \ | |||||
* | \ \ | Merge branch 'dev' into 'dev' | M. Dent | 2018-10-07 | 1 | -2/+3 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add missing else clause See merge request hubzilla/core!1317 | ||||
| * | | | | Add missing else clause | M.Dent | 2018-10-06 | 1 | -2/+3 |
| | | | | | |||||
* | | | | | move profile assign selector to profile settings and personal menu selector ↵ | Mario Vavti | 2018-10-06 | 1 | -8/+19 |
|/ / / / | | | | | | | | | | | | | to channel_home settings and get rid of misc channel settings section. | ||||
* | | / | strings and force import_system_apps() on std_version change | Mario Vavti | 2018-10-06 | 1 | -0/+5 |
| |_|/ |/| | | |||||
* | | | 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 |
| |