aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge branch 'patch-16' into 'dev'Mario2018-10-153-8/+9
|\ \ \
| * | | Update main.jsMax Kostikov2018-10-141-6/+7
| * | | Update main.jsMax Kostikov2018-10-141-1/+1
| * | | Update language.phpMax Kostikov2018-10-141-1/+1
| * | | JS plurals displaying code cleanupMax Kostikov2018-10-141-1/+1
* | | | Merge branch 'patch-15' into 'dev'Mario2018-10-151-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Update hstrings.phpMax Kostikov2018-10-141-1/+1
| * | | Add JS function code for plurals translationMax Kostikov2018-10-141-0/+1
|/ / /
* | | min version bumpMario Vavti2018-10-131-1/+1
* | | Merge branch 'patch-14' into 'dev'Mario2018-10-135-27/+65
|\ \ \
| * | | Update js_strings.phpMax Kostikov2018-10-131-5/+5
| * | | Update po2php.phpMax Kostikov2018-10-131-2/+3
| * | | Update main.jsMax Kostikov2018-10-131-19/+21
| * | | Update js_strings.tplMax Kostikov2018-10-131-1/+1
| * | | Update language.phpMax Kostikov2018-10-131-0/+26
| * | | Add date/time plurals translation in JavaScriptMax Kostikov2018-10-131-0/+9
|/ / /
* | | Revert "Merge branch 'patch-11' into 'dev'"Mario Vavti2018-10-134-65/+25
* | | Merge branch 'patch-12' into 'dev'Mario2018-10-132-103/+138
|\ \ \
| * | | Update hmessages.poMax Kostikov2018-10-131-2/+2
| * | | Update hstrings.phpMax Kostikov2018-10-131-2/+2
| * | | Update hstrings.phpMax Kostikov2018-10-131-7/+27
| * | | New russian plurals for JavaScriptMax Kostikov2018-10-131-96/+111
|/ / /
* | | bump versionMario Vavti2018-10-131-1/+1
* | | Merge branch 'dev' into 'dev'Mario2018-10-131-2/+3
|\ \ \
| * | | Fix order of assignment and get template file before returnZotSocial Admin2018-10-121-2/+3
| |/ /
* | | Merge branch 'patch-11' into 'dev'Mario2018-10-134-25/+65
|\ \ \
| * | | Update language.phpMax Kostikov2018-10-131-2/+1
| * | | Update language.phpMax Kostikov2018-10-131-3/+4
| * | | Update language.phpMax Kostikov2018-10-131-2/+2
| * | | Update language.phpMax Kostikov2018-10-131-1/+1
| * | | Update language.phpMax Kostikov2018-10-131-2/+1
| * | | Update language.phpMax Kostikov2018-10-131-4/+2
| * | | Update language.phpMax Kostikov2018-10-131-1/+1
| * | | Update language.phpMax Kostikov2018-10-131-1/+1
| * | | Update main.jsMax Kostikov2018-10-131-19/+22
| * | | Update language.phpMax Kostikov2018-10-131-5/+5
| * | | Update js_strings.tplMax Kostikov2018-10-121-1/+1
| * | | Update language.phpMax Kostikov2018-10-121-0/+31
| * | | Add plurals translation at browser side (JS)Max Kostikov2018-10-121-5/+14
| |/ /
* | | Merge branch 'patch-10' into 'dev'Mario2018-10-132-102/+102
|\ \ \ | |/ / |/| |
| * | Update hmessages.poMax Kostikov2018-10-121-1/+1
| * | Update hstrings.phpMax Kostikov2018-10-121-1/+1
| * | Update hstrings.phpMax Kostikov2018-10-121-2/+2
| * | Update hmessages.poMax Kostikov2018-10-121-2/+2
| * | Update hstrings.phpMax Kostikov2018-10-111-4/+4
| * | Missed strings added to Russian translationMax Kostikov2018-10-111-92/+92
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-10-122-4/+26
|\ \ \ | |/ / |/| / | |/
| * verify some edge case http signatureszotlabs2018-10-112-4/+26
* | Merge branch 'dev' into 'dev'Mario2018-10-112-7/+7
|\ \
| * | Typos in Spanish translationManuel Jiménez Friaza2018-10-112-7/+7
|/ /