aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-10-052-1/+7
|\
| * regression: double linebreaks in viewsrc outputzotlabs2018-10-031-1/+1
| * do not propagate channel deletion for an already deleted channel.zotlabs2018-10-021-0/+6
* | bump versionMario Vavti2018-10-051-1/+1
* | optimize autoloaderMario Vavti2018-10-052-8/+34
* | stringsMario Vavti2018-10-051-2535/+2720
* | bump versionMario Vavti2018-10-051-2/+1
* | fix issues with bs accordionsMario Vavti2018-10-044-7/+7
* | fix displaying of perm cats selectorMario Vavti2018-10-041-2/+4
* | whitespaceMario Vavti2018-10-041-1/+0
* | move *_divmore_height setting to the module extra_settings, and fix issue whe...Mario Vavti2018-10-0414-18/+95
* | move *_list_mode to featuresMario Vavti2018-10-045-10/+18
* | Merge branch 'patch-1' into 'dev'Mario2018-10-041-5/+4
|\ \
| * | Update settings.tplMax Kostikov2018-10-041-5/+4
* | | Merge branch 'patch-1' into 'dev'Mario2018-10-041-19/+21
|\| |
| * | button sticking fixedMax Kostikov2018-10-031-19/+21
* | | remove redundant varMario Vavti2018-10-041-2/+0
* | | add apd fileMario Vavti2018-10-041-0/+6
* | | defperm appMario Vavti2018-10-043-23/+39
* | | uexport appMario Vavti2018-10-044-11/+24
|/ /
* | bump activity app versionMario2018-10-031-1/+1
* | jot: show settings icon only to local profile ownerMario2018-10-032-1/+4
* | 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.M.Dent2018-10-021-1/+1
* | | | move filing from conversation to network - it is only functional there.Mario Vavti2018-10-031-8/+8
|/ / /
* | | add app_destroy hook which allows addons to perform post delete actionsMario Vavti2018-10-023-0/+8
* | | do not rely on startpage pconfig anymoreMario Vavti2018-10-011-1/+1
* | | do not default to channel_startpage if startpage app is not installedMario Vavti2018-10-011-4/+2
* | | indicate locked featuresMario Vavti2018-10-013-5/+3
|/ /
* | Merge branch 'status-editor-hook' into 'dev'M. Dent2018-09-2920-18/+66
|\ \
| * | Status editor hookM. Dent2018-09-2920-18/+66
|/ /
* | do not unset $_GET[search] and adjust activity_order widgetMario Vavti2018-09-292-2/+2
* | improve network searchMario Vavti2018-09-291-15/+4
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-09-2935-129/+28
|\ \
| * \ Merge branch 'remove-servicelevel-logic' into 'dev'M. Dent2018-09-2916-109/+8
| |\ \
| | * | Remove servicelevel logicM. Dent2018-09-2916-109/+8
| |/ /
| * | Merge translations for non-installed apps messageM. Dent2018-09-2819-20/+20
| |\ \
| | * | Update Group.phpMax Kostikov2018-09-281-1/+1
| | * | Update Wiki.phpMax Kostikov2018-09-281-1/+1
| | * | Update Webpages.phpMax Kostikov2018-09-281-1/+1
| | * | Update Tokens.phpMax Kostikov2018-09-281-1/+1
| | * | Update Sources.phpMax Kostikov2018-09-281-1/+1
| | * | Update Poke.phpMax Kostikov2018-09-281-1/+1
| | * | Update Permcats.phpMax Kostikov2018-09-281-1/+1
| | * | Update Pdledit.phpMax Kostikov2018-09-281-1/+1
| | * | Update Oauth2.phpMax Kostikov2018-09-281-1/+1
| | * | Update Oauth.phpMax Kostikov2018-09-281-1/+1
| | * | Update Notes.phpMax Kostikov2018-09-281-1/+1