Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'patch-17' into 'dev' | Mario | 2018-10-16 | 2 | -101/+116 |
* | 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 |
* | Merge branch 'patch-16' into 'dev' | Mario | 2018-10-15 | 3 | -8/+9 |
* | Merge branch 'patch-15' into 'dev' | Mario | 2018-10-15 | 1 | -0/+1 |
* | another min version change to mitigate caching issues. we are now at 3.8RC2.2 | Mario | 2018-10-13 | 1 | -1/+1 |
* | Merge branch 'patch-14' into 'dev' | Mario | 2018-10-13 | 5 | -27/+65 |
* | bump version to 3.8RC2.1 due to javascript changes | Mario | 2018-10-13 | 1 | -1/+1 |
* | Merge branch 'dev' into 3.8RC | Mario Vavti | 2018-10-13 | 4 | -65/+25 |
|\ | |||||
| * | 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 |
| |/ | |||||
* | | 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 |
* | | version 3.8RC2 | Mario Vavti | 2018-10-13 | 1 | -1/+1 |
* | | Merge branch 'dev' into 3.8RC | Mario Vavti | 2018-10-13 | 9 | -13622/+13807 |
|\| | |||||
| * | 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 |
| | * | | 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 |
| |\ \ | | |/ | |/| | |||||
| | * | 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 |
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-10-12 | 2 | -4/+26 |
| |\ \ | | |/ | |/| |