aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev'zotlabs2018-10-0477-474/+806
|\
| * fix issues with bs accordionsMario Vavti2018-10-041-2/+2
| * 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-0411-13/+83
| * move *_list_mode to featuresMario Vavti2018-10-043-8/+2
| * remove redundant varMario Vavti2018-10-041-2/+0
| * defperm appMario Vavti2018-10-043-23/+39
| * uexport appMario Vavti2018-10-042-10/+18
| * add app_destroy hook which allows addons to perform post delete actionsMario Vavti2018-10-021-0/+1
| * 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-011-1/+1
| * Status editor hookM. Dent2018-09-2917-17/+17
| * 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-2928-99/+25
| |\
| | * Remove servicelevel logicM. Dent2018-09-299-79/+5
| | * 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
| | * Update Mood.phpMax Kostikov2018-09-281-1/+1
| | * Update Lang.phpMax Kostikov2018-09-281-1/+1
| | * Update Invite.phpMax Kostikov2018-09-281-1/+1
| | * Update Connect.phpMax Kostikov2018-09-281-1/+1
| | * Update Chat.phpMax Kostikov2018-09-281-1/+1
| | * Update Cdav.phpMax Kostikov2018-09-281-2/+2
| | * Update Cards.phpMax Kostikov2018-09-281-1/+1
| | * Update Articles.phpMax Kostikov2018-09-281-1/+1
| | * Merge branch 'patch-11' into 'dev'Max Kostikov2018-09-281-1/+1
| | |\
| | | * add translationsMax Kostikov2018-09-281-1/+1
| | * | Merge branch 'patch-12' into 'dev'Max Kostikov2018-09-281-1/+1
| | |\ \
| | | * | Update Oauth2.phpMax Kostikov2018-09-281-1/+1
| | | |/
| | * | Merge branch 'patch-13' into 'dev'Max Kostikov2018-09-281-1/+1
| | |\ \
| | | * | Update Pdledit.phpMax Kostikov2018-09-281-1/+1
| | | |/
| | * | Merge branch 'patch-14' into 'dev'Max Kostikov2018-09-281-1/+1
| | |\ \
| | | * | Update Permcats.phpMax Kostikov2018-09-281-1/+1
| | | |/
| | * | Merge branch 'patch-15' into 'dev'Max Kostikov2018-09-281-1/+1
| | |\ \
| | | * | Update Poke.phpMax Kostikov2018-09-281-1/+1
| | | |/
| | * | Merge branch 'patch-16' into 'dev'Max Kostikov2018-09-281-1/+1
| | |\ \
| | | * | Update Sources.phpMax Kostikov2018-09-281-1/+1
| | | |/
| | * | Merge branch 'patch-17' into 'dev'Max Kostikov2018-09-281-1/+1
| | |\ \