aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* add missing features section to newmember widgetMario Vavti2018-10-151-1/+7
* allow to undelete deleted base appsMario Vavti2018-10-151-2/+2
* some changelog workMario Vavti2018-10-151-1/+68
* fix wiki issue with wiki page links when using bbcodeMario Vavti2018-10-151-3/+2
* update readme for master and dev branch buildstatusMario Vavti2018-10-151-1/+4
* Merge branch 'dev' into 'dev'Mario2018-10-155-9/+92
|\
| * fix phpunit error with html2markdown test and temporary disable failing markd...git-marijus2018-10-132-7/+12
| * fix dba_pdoTestgit-marijus2018-10-131-2/+2
| * add gitlab-ci.yml and phpunit.xmlgit-marijus2018-10-132-0/+78
* | 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