aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'patch-18' into 'dev'Max Kostikov2018-09-281-1/+1
|\
| * Update Webpages.phpMax Kostikov2018-09-281-1/+1
* | Merge branch 'patch-19' into 'dev'Max Kostikov2018-09-281-1/+1
|\ \
| * | Update Wiki.phpMax Kostikov2018-09-281-1/+1
| |/
* | Merge branch 'patch-20' into 'dev'Max Kostikov2018-09-281-1/+1
|\ \
| * | Update Articles.phpMax Kostikov2018-09-281-1/+1
| |/
* | 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
|/
* move display settings upMario Vavti2018-09-281-5/+6
* settings for channel homeMario Vavti2018-09-281-0/+43
* add transaction, commit and rollback to update 1221Mario2018-09-281-0/+5
* Merge branch 'patch-10' into 'dev'Mario2018-09-2812-55/+75
|\
| * Update Import.phpMax Kostikov2018-09-281-1/+1
| * Update Group.phpMax Kostikov2018-09-281-21/+21
| * Update Libsync.phpMax Kostikov2018-09-281-13/+13
| * 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
| * Update Activity_filter.phpMax Kostikov2018-09-281-1/+1
| * rename groups and group_members tables for MySQL 8 compatibilityMax Kostikov2018-09-271-0/+20
* | 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
| |/
* | Merge branch 'patch-9' into 'dev'M. Dent2018-09-281-2/+17
|\ \
| * | Add translation for new appsMax Kostikov2018-09-271-2/+17
| |/
* / Missprint in Oauth.php fixedMax Kostikov2018-09-271-1/+1
|/
* Merge branch 'dev' into 'dev'M. Dent2018-09-271-0/+1
|\
| * Translate system app namesM.Dent2018-09-271-0/+1
* | implement conversation tools (settings/conversation), remove additional featu...Mario Vavti2018-09-274-44/+66
* | tokens: add css file and fix argc and argv valuesMario Vavti2018-09-261-3/+3
* | guest access appMario Vavti2018-09-263-19/+29
* | permcats appMario Vavti2018-09-264-21/+30
|/