aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | Update Tokens.phpMax Kostikov2018-09-281-1/+1
| |/
* | 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
|/
* 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
|/