aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* strings and bump apd versions to version 2Mario Vavti2018-10-1940-470/+519
|
* Merge branch 'dev' into 'dev'Mario2018-10-181-1/+2
|\ | | | | | | | | Fix template root redirection See merge request hubzilla/core!1343
| * Fix template root redirectionM.Dent2018-10-171-1/+2
|/
* complete changelogMario Vavti2018-10-171-2/+34
|
* Merge branch 'fix-master-rate-limiter' into 'dev'Mario2018-10-161-2/+9
|\ | | | | | | | | Fix master rate limiter See merge request hubzilla/core!1341
| * Fix master rate limiterM. Dent2018-10-161-2/+9
|/
* Merge branch 'dev' into 'dev'M. Dent2018-10-161-5/+9
|\ | | | | | | | | improve posting to mod pconfig via ajax See merge request hubzilla/core!1340
| * improve posting to mod pconfig via ajaxMario Vavti2018-10-161-5/+9
| |
* | Merge branch 'patch-17' into 'dev'Mario2018-10-162-101/+116
|\ \ | |/ |/| | | | | Add Russian translations to Newmember widget See merge request hubzilla/core!1339
| * Update hstrings.phpMax Kostikov2018-10-151-0/+3
| |
| * Add Russian translations to Newmember widgetMax Kostikov2018-10-151-101/+113
|/
* 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
|\ | | | | | | | | 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-marijus2018-10-132-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_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
|\ \ | | | | | | | | | | | | JS plurals displaying code cleanup See merge request hubzilla/core!1338
| * | 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
|\ \ \ | |/ / |/| | | | | | | | Add JS function code for plurals translation in Russian See merge request hubzilla/core!1337
| * | 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
|\ \ | | | | | | | | | | | | Add date/time plurals translation in JavaScript See merge request hubzilla/core!1336
| * | 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
| | | | | | | | | | This reverts commit e5184458530bb0394e12026c82ee89257115f690, reversing changes made to 8ce240b95c62f4b702b60977f63b0223a8ec0849.
* | Merge branch 'patch-12' into 'dev'Mario2018-10-132-103/+138
|\ \ | | | | | | | | | | | | New russian plurals for JavaScript See merge request hubzilla/core!1333
| * | 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 return See merge request hubzilla/core!1329
| * | 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
|\ \ | | | | | | | | | | | | Add date/time plurals translation in JavaScript See merge request hubzilla/core!1331
| * | 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 21:34:05 +0000