Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'patch-19' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
|\ | |||||
| * | Update Wiki.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
* | | Merge branch 'patch-20' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
|\ \ | |||||
| * | | Update Articles.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'patch-21' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
|\ \ | |||||
| * | | Update Cards.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'patch-22' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -2/+2 |
|\ \ | |||||
| * | | Update Cdav.php | Max Kostikov | 2018-09-28 | 1 | -2/+2 |
| |/ | |||||
* | | Merge branch 'patch-23' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
|\ \ | |||||
| * | | Update Chat.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'patch-24' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
|\ \ | |||||
| * | | Update Connect.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'patch-25' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
|\ \ | |||||
| * | | Update Group.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'patch-26' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
|\ \ | |||||
| * | | Update Invite.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'patch-27' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
|\ \ | |||||
| * | | Update Lang.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'patch-28' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
|\ \ | |||||
| * | | Update Mood.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| |/ | |||||
* / | Update Notes.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
|/ | |||||
* | move display settings up | Mario Vavti | 2018-09-28 | 1 | -5/+6 |
* | settings for channel home | Mario Vavti | 2018-09-28 | 1 | -0/+43 |
* | add transaction, commit and rollback to update 1221 | Mario | 2018-09-28 | 1 | -0/+5 |
* | Merge branch 'patch-10' into 'dev' | Mario | 2018-09-28 | 12 | -55/+75 |
|\ | |||||
| * | Update Import.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| * | Update Group.php | Max Kostikov | 2018-09-28 | 1 | -21/+21 |
| * | Update Libsync.php | Max Kostikov | 2018-09-28 | 1 | -13/+13 |
| * | Update Acl.php | Max Kostikov | 2018-09-28 | 1 | -7/+7 |
| * | Update Connections.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| * | Update Contactgroup.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| * | Update Group.php | Max Kostikov | 2018-09-28 | 1 | -5/+5 |
| * | Update Lockview.php | Max Kostikov | 2018-09-28 | 1 | -2/+2 |
| * | Update Network.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| * | Update Channel.php | Max Kostikov | 2018-09-28 | 1 | -2/+2 |
| * | Update Activity_filter.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| * | rename groups and group_members tables for MySQL 8 compatibility | Max Kostikov | 2018-09-27 | 1 | -0/+20 |
* | | Merge branch 'channel-limits' into 'dev' | M. Dent | 2018-09-28 | 1 | -2/+6 |
|\ \ | |||||
| * | | Hide form when at or over service_class['limit_identities'] | M.Dent | 2018-09-27 | 1 | -2/+6 |
| |/ | |||||
* | | Merge branch 'patch-9' into 'dev' | M. Dent | 2018-09-28 | 1 | -2/+17 |
|\ \ | |||||
| * | | Add translation for new apps | Max Kostikov | 2018-09-27 | 1 | -2/+17 |
| |/ | |||||
* / | Missprint in Oauth.php fixed | Max Kostikov | 2018-09-27 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'dev' into 'dev' | M. Dent | 2018-09-27 | 1 | -0/+1 |
|\ | |||||
| * | Translate system app names | M.Dent | 2018-09-27 | 1 | -0/+1 |
* | | implement conversation tools (settings/conversation), remove additional featu... | Mario Vavti | 2018-09-27 | 4 | -44/+66 |
* | | tokens: add css file and fix argc and argv values | Mario Vavti | 2018-09-26 | 1 | -3/+3 |
* | | guest access app | Mario Vavti | 2018-09-26 | 3 | -19/+29 |
* | | permcats app | Mario Vavti | 2018-09-26 | 4 | -21/+30 |
|/ | |||||
* | remove oauth from features | Mario Vavti | 2018-09-26 | 1 | -16/+0 |
* | add check for local_channel() | Mario Vavti | 2018-09-26 | 2 | -0/+13 |