aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge branch 'patch-21' into 'dev'Max Kostikov2018-09-281-1/+1
| |\ \
| | * | Update Cards.phpMax Kostikov2018-09-281-1/+1
| | |/
| * | Merge branch 'patch-22' into 'dev'Max Kostikov2018-09-281-2/+2
| |\ \
| | * | Update Cdav.phpMax Kostikov2018-09-281-2/+2
| | |/
| * | Merge branch 'patch-23' into 'dev'Max Kostikov2018-09-281-1/+1
| |\ \
| | * | Update Chat.phpMax Kostikov2018-09-281-1/+1
| | |/
| * | Merge branch 'patch-24' into 'dev'Max Kostikov2018-09-281-1/+1
| |\ \
| | * | Update Connect.phpMax Kostikov2018-09-281-1/+1
| | |/
| * | Merge branch 'patch-25' into 'dev'Max Kostikov2018-09-281-1/+1
| |\ \
| | * | Update Group.phpMax Kostikov2018-09-281-1/+1
| | |/
| * | Merge branch 'patch-26' into 'dev'Max Kostikov2018-09-281-1/+1
| |\ \
| | * | Update Invite.phpMax Kostikov2018-09-281-1/+1
| | |/
| * | Merge branch 'patch-27' into 'dev'Max Kostikov2018-09-281-1/+1
| |\ \
| | * | Update Lang.phpMax Kostikov2018-09-281-1/+1
| | |/
| * | Merge branch 'patch-28' into 'dev'Max Kostikov2018-09-281-1/+1
| |\ \
| | * | Update Mood.phpMax Kostikov2018-09-281-1/+1
| | |/
| * / Update Notes.phpMax Kostikov2018-09-281-1/+1
| |/
* / appman: query terms also by uid to prevent double entriesMario Vavti2018-09-291-2/+4
|/
* settings for channel homeMario Vavti2018-09-281-0/+43
* Merge branch 'patch-10' into 'dev'Mario2018-09-288-20/+20
|\
| * Update Import.phpMax Kostikov2018-09-281-1/+1
| * Update Acl.phpMax Kostikov2018-09-281-7/+7
| * Update Connections.phpMax Kostikov2018-09-281-1/+1
| * Update Contactgroup.phpMax Kostikov2018-09-281-1/+1
| * Update Group.phpMax Kostikov2018-09-281-5/+5
| * Update Lockview.phpMax Kostikov2018-09-281-2/+2
| * Update Network.phpMax Kostikov2018-09-281-1/+1
| * Update Channel.phpMax Kostikov2018-09-281-2/+2
* | Merge branch 'channel-limits' into 'dev'M. Dent2018-09-281-2/+6
|\ \
| * | Hide form when at or over service_class['limit_identities']M.Dent2018-09-271-2/+6
| |/
* / Missprint in Oauth.php fixedMax Kostikov2018-09-271-1/+1
|/
* implement conversation tools (settings/conversation), remove additional featu...Mario Vavti2018-09-272-34/+61
* tokens: add css file and fix argc and argv valuesMario Vavti2018-09-261-3/+3
* guest access appMario Vavti2018-09-262-11/+29
* permcats appMario Vavti2018-09-263-13/+30
* add check for local_channel()Mario Vavti2018-09-262-0/+13
* change wordingMario Vavti2018-09-262-4/+4
* wrong app nameMario Vavti2018-09-261-1/+1
* oauth and oauth2 apps managerMario Vavti2018-09-262-45/+76
* appification of the pdl editor and move advanced_theming to theme settings wh...Mario Vavti2018-09-262-15/+16
* appification of privacy groupsMario Vavti2018-09-251-5/+24
* move advanced_theming switch to settings/display for nowMario Vavti2018-09-251-3/+8
* move start_menu switch to settings/display for nowMario Vavti2018-09-251-1/+11
* premium channel appMario Vavti2018-09-251-21/+47
* appification of notesMario Vavti2018-09-241-7/+34
* add fileMario2018-09-241-0/+43
* settings for directory and set App::$profile_uid in directory if local_channel()Mario2018-09-241-1/+5
* only explain how to select a channel if there are channels to selectMario2018-09-231-2/+2
* minor cleanupMario2018-09-231-2/+0
* use different settings for cal_first_day in events and cdav/calendar. This is...Mario2018-09-232-2/+2