Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into 'dev' | Mario | 2018-10-15 | 5 | -9/+92 |
|\ | | | | | | | | | Bring back some basic automated testing for PHP7.1 and mysql via gitlab-ci. See merge request hubzilla/core!1332 | ||||
| * | fix phpunit error with html2markdown test and temporary disable failing ↵ | git-marijus | 2018-10-13 | 2 | -7/+12 |
| | | | | | | | | markdown test in connection with **bold** and _italic_ (it is not clear why they fail and the code appears to work as expected) | ||||
| * | 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 |
|\ \ | | | | | | | | | | | | | JS plurals displaying code cleanup See merge request hubzilla/core!1338 | ||||
| * | | 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 |
|\ \ \ | |/ / |/| | | | | | | | | Add JS function code for plurals translation in Russian See merge request hubzilla/core!1337 | ||||
| * | | 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 |
|\ \ | | | | | | | | | | | | | Add date/time plurals translation in JavaScript See merge request hubzilla/core!1336 | ||||
| * | | 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 |
| | | | | | | | | | | This reverts commit e5184458530bb0394e12026c82ee89257115f690, reversing changes made to 8ce240b95c62f4b702b60977f63b0223a8ec0849. | ||||
* | | Merge branch 'patch-12' into 'dev' | Mario | 2018-10-13 | 2 | -103/+138 |
|\ \ | | | | | | | | | | | | | New russian plurals for JavaScript See merge request hubzilla/core!1333 | ||||
| * | | 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 See merge request hubzilla/core!1329 | ||||
| * | | 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 |
|\ \ | | | | | | | | | | | | | Add date/time plurals translation in JavaScript See merge request hubzilla/core!1331 | ||||
| * | | 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 |
| | | | |||||
| * | | Add plurals translation at browser side (JS) | Max Kostikov | 2018-10-12 | 1 | -5/+14 |
| |/ | |||||
* | | Merge branch 'patch-10' into 'dev' | Mario | 2018-10-13 | 2 | -102/+102 |
|\ \ | |/ |/| | | | | | Missed strings added to Russian translation See merge request hubzilla/core!1328 | ||||
| * | Update hmessages.po | Max Kostikov | 2018-10-12 | 1 | -1/+1 |
| | | |||||
| * | Update hstrings.php | Max Kostikov | 2018-10-12 | 1 | -1/+1 |
| | | |||||
| * | Update hstrings.php | Max Kostikov | 2018-10-12 | 1 | -2/+2 |
| | | |||||
| * | Update hmessages.po | Max Kostikov | 2018-10-12 | 1 | -2/+2 |
| | | |||||
| * | Update hstrings.php | Max Kostikov | 2018-10-11 | 1 | -4/+4 |
| | | |||||
| * | Missed strings added to Russian translation | Max Kostikov | 2018-10-11 | 1 | -92/+92 |
| | |