aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/
* | Merge branch 'patch-29' into 'dev'Max Kostikov2018-09-28719-3187/+62139
|\ \
| * | Update Notes.phpMax Kostikov2018-09-281-1/+1
| |/
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2018-09-284-15/+64
| |\
| | * move display settings upMario Vavti2018-09-281-5/+6
| | * settings for channel homeMario Vavti2018-09-283-10/+58
| * | nav_channel_select should be off by defaultMario2018-09-281-1/+1
| |/
| * add transaction, commit and rollback to update 1221Mario2018-09-281-0/+5
| * Merge branch 'patch-10' into 'dev'Mario2018-09-2825-118/+137
| |\
| | * Update zot.phpMax Kostikov2018-09-281-1/+1
| | * Update Group.phpMax Kostikov2018-09-280-0/+0
| | * Update security.phpMax Kostikov2018-09-281-1/+1
| | * Update Group.phpMax Kostikov2018-09-280-0/+0
| | * Update zot.phpMax Kostikov2018-09-281-14/+14
| | * Update group.phpMax Kostikov2018-09-281-21/+21
| | * 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