Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'patch-17' into 'dev' | Mario | 2018-10-16 | 2 | -101/+116 |
|\ | |||||
| * | Update hstrings.php | Max Kostikov | 2018-10-15 | 1 | -0/+3 |
| * | Add Russian translations to Newmember widget | Max Kostikov | 2018-10-15 | 1 | -101/+113 |
|/ | |||||
* | add missing features section to newmember widget | Mario Vavti | 2018-10-15 | 1 | -1/+7 |
* | allow to undelete deleted base apps | Mario Vavti | 2018-10-15 | 1 | -2/+2 |
* | some changelog work | Mario Vavti | 2018-10-15 | 1 | -1/+68 |
* | fix wiki issue with wiki page links when using bbcode | Mario Vavti | 2018-10-15 | 1 | -3/+2 |
* | update readme for master and dev branch buildstatus | Mario Vavti | 2018-10-15 | 1 | -1/+4 |
* | Merge branch 'dev' into 'dev' | Mario | 2018-10-15 | 5 | -9/+92 |
|\ | |||||
| * | fix phpunit error with html2markdown test and temporary disable failing markd... | git-marijus | 2018-10-13 | 2 | -7/+12 |
| * | fix dba_pdoTest | git-marijus | 2018-10-13 | 1 | -2/+2 |
| * | add gitlab-ci.yml and phpunit.xml | git-marijus | 2018-10-13 | 2 | -0/+78 |
* | | Merge branch 'patch-16' into 'dev' | Mario | 2018-10-15 | 3 | -8/+9 |
|\ \ | |||||
| * | | Update main.js | Max Kostikov | 2018-10-14 | 1 | -6/+7 |
| * | | Update main.js | Max Kostikov | 2018-10-14 | 1 | -1/+1 |
| * | | Update language.php | Max Kostikov | 2018-10-14 | 1 | -1/+1 |
| * | | JS plurals displaying code cleanup | Max Kostikov | 2018-10-14 | 1 | -1/+1 |
* | | | Merge branch 'patch-15' into 'dev' | Mario | 2018-10-15 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Update hstrings.php | Max Kostikov | 2018-10-14 | 1 | -1/+1 |
| * | | Add JS function code for plurals translation | Max Kostikov | 2018-10-14 | 1 | -0/+1 |
|/ / | |||||
* | | min version bump | Mario Vavti | 2018-10-13 | 1 | -1/+1 |
* | | Merge branch 'patch-14' into 'dev' | Mario | 2018-10-13 | 5 | -27/+65 |
|\ \ | |||||
| * | | Update js_strings.php | Max Kostikov | 2018-10-13 | 1 | -5/+5 |
| * | | Update po2php.php | Max Kostikov | 2018-10-13 | 1 | -2/+3 |
| * | | Update main.js | Max Kostikov | 2018-10-13 | 1 | -19/+21 |
| * | | Update js_strings.tpl | Max Kostikov | 2018-10-13 | 1 | -1/+1 |
| * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -0/+26 |
| * | | Add date/time plurals translation in JavaScript | Max Kostikov | 2018-10-13 | 1 | -0/+9 |
|/ / | |||||
* | | Revert "Merge branch 'patch-11' into 'dev'" | Mario Vavti | 2018-10-13 | 4 | -65/+25 |
* | | Merge branch 'patch-12' into 'dev' | Mario | 2018-10-13 | 2 | -103/+138 |
|\ \ | |||||
| * | | Update hmessages.po | Max Kostikov | 2018-10-13 | 1 | -2/+2 |
| * | | Update hstrings.php | Max Kostikov | 2018-10-13 | 1 | -2/+2 |
| * | | Update hstrings.php | Max Kostikov | 2018-10-13 | 1 | -7/+27 |
| * | | New russian plurals for JavaScript | Max Kostikov | 2018-10-13 | 1 | -96/+111 |
|/ / | |||||
* | | bump version | Mario Vavti | 2018-10-13 | 1 | -1/+1 |
* | | Merge branch 'dev' into 'dev' | Mario | 2018-10-13 | 1 | -2/+3 |
|\ \ | |||||
| * | | Fix order of assignment and get template file before return | ZotSocial Admin | 2018-10-12 | 1 | -2/+3 |
| |/ | |||||
* | | Merge branch 'patch-11' into 'dev' | Mario | 2018-10-13 | 4 | -25/+65 |
|\ \ | |||||
| * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -2/+1 |
| * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -3/+4 |
| * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -2/+2 |
| * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -1/+1 |
| * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -2/+1 |
| * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -4/+2 |
| * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -1/+1 |
| * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -1/+1 |
| * | | Update main.js | Max Kostikov | 2018-10-13 | 1 | -19/+22 |
| * | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -5/+5 |
| * | | Update js_strings.tpl | Max Kostikov | 2018-10-12 | 1 | -1/+1 |
| * | | Update language.php | Max Kostikov | 2018-10-12 | 1 | -0/+31 |