aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
Commit message (Expand)AuthorAgeFilesLines
...
* 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
* settings for events and cdav calendarMario2018-09-237-5/+138
* provide settings for mod photo and make it slightly simpler to create new mod...Mario2018-09-235-32/+57
* keep the features in the central array but sort them by module nameMario2018-09-235-232/+20
* this should be off by defaultMario2018-09-221-1/+1
* add files and settings for channel managerMario2018-09-223-1/+128
* introduce profile settings and provide a way for modules without an app to st...Mario2018-09-221-2/+2
* appification of sourcesMario Vavti2018-09-222-16/+15
* add fileMario Vavti2018-09-211-0/+120
* provide a return path from settings pagesMario Vavti2018-09-212-0/+4
* don't double encodezotlabs2018-09-202-2/+2
* remove bbcode from event hovertipzotlabs2018-09-202-3/+4
* Merge branch 'dev'zotlabs2018-09-203-31/+66
|\
| * remove connection filter from network settingsMario Vavti2018-09-201-8/+0
| * move connection filtering setting from network to connections, provide a link...Mario Vavti2018-09-203-21/+65
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-09-201-1/+1
| |\
| * | remove superfluous commaMario Vavti2018-09-171-1/+1
| * | remove unused variableMario Vavti2018-09-171-1/+0
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-09-171-4/+4
| |\ \
* | | | bookmarks fail to synczotlabs2018-09-201-1/+1
| |_|/ |/| |