Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'patch-13' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
|\ | |||||
| * | Update Pdledit.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
* | | Merge branch 'patch-14' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
|\ \ | |||||
| * | | Update Permcats.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'patch-15' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
|\ \ | |||||
| * | | Update Poke.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'patch-16' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
|\ \ | |||||
| * | | Update Sources.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'patch-17' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
|\ \ | |||||
| * | | Update Tokens.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'patch-18' into 'dev' | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
|\ \ | |||||
| * | | Update Webpages.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| |/ | |||||
* | | 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 |
|/ | |||||
* | settings for channel home | Mario Vavti | 2018-09-28 | 1 | -0/+43 |
* | Merge branch 'patch-10' into 'dev' | Mario | 2018-09-28 | 8 | -20/+20 |
|\ | |||||
| * | Update Import.php | Max Kostikov | 2018-09-28 | 1 | -1/+1 |
| * | 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 |
* | | 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 |
| |/ | |||||
* / | Missprint in Oauth.php fixed | Max Kostikov | 2018-09-27 | 1 | -1/+1 |
|/ | |||||
* | implement conversation tools (settings/conversation), remove additional featu... | Mario Vavti | 2018-09-27 | 2 | -34/+61 |
* | 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 | 2 | -11/+29 |
* | permcats app | Mario Vavti | 2018-09-26 | 3 | -13/+30 |