Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ \ | | |/ | |/| | |||||
| | * | verify some edge case http signatures | zotlabs | 2018-10-11 | 2 | -4/+26 |
| * | | Merge branch 'dev' into 'dev' | Mario | 2018-10-11 | 2 | -7/+7 |
| |\ \ | |||||
| | * | | Typos in Spanish translation | Manuel Jiménez Friaza | 2018-10-11 | 2 | -7/+7 |
| |/ / | |||||
| * | | Merge branch 'dev' into 'dev' | Mario | 2018-10-11 | 4 | -1/+19 |
| |\ \ | |||||
| | * | | Add wiki_preprocess hook and documentation | M.Dent | 2018-10-10 | 4 | -1/+19 |
| * | | | Merge branch 'patch-9' into 'dev' | Mario | 2018-10-11 | 2 | -2/+2 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Update hstrings.php | Max Kostikov | 2018-10-10 | 1 | -1/+1 |
| | * | | Formatting fix in russian translation | Max Kostikov | 2018-10-10 | 1 | -1/+1 |
| * | | | fix issue in zot finger | Mario Vavti | 2018-10-10 | 1 | -1/+1 |
| * | | | revert gitlab-ci until we have a working configuration | Mario Vavti | 2018-10-10 | 1 | -41/+0 |
| |/ / |