aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
| |/ / /
* | | | Merge branch 'dev' into 'dev'Mario2018-10-262-443/+516
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New strings in Spanish translation See merge request hubzilla/core!1349 (cherry picked from commit df449e7bfeb529c858007c7145f5587e87d87aa6) 802a7ff3 New strings in Spanish translation
* | | | for whatever reason there were two of thesezotlabs2018-10-2356-10173/+0
| | | | | | | | | | | | (cherry picked from commit 7ed197f46b189601ac043f4bfeab41204a43488b)
* | | | version 3.8.13.8.1Mario2018-10-211-1/+1
| | | |
* | | | changelog for 3.8.1Mario Vavti2018-10-211-0/+6
| | | | | | | | | | | | (cherry picked from commit ea850e58d219a756189532bbb3e9ec8d85e9ba6a)
* | | | fix ellipsis for too long nav bannerMario Vavti2018-10-211-0/+5
| | | | | | | | | | | | (cherry picked from commit a61ce45a32fa07249ee46160fd56ec08e67df601)
* | | | fix wrong value being used for menu_idmike2018-10-211-1/+1
| | | | | | | | | | | | (cherry picked from commit fdb7c115a7504e431d9dd35af4901ef50367c67b)
* | | | disable blueimp demo serverzotlabs2018-10-211-15/+0
| | | | | | | | | | | | (cherry picked from commit 7c49f227022ccbfe020121029da94373765abd67)
* | | | Merge branch '3.8RC'3.8Mario Vavti2018-10-19862-25448/+94389
|\ \ \ \
| * | | | version 3.8Mario Vavti2018-10-191-1/+1
| | | | |
| * | | | optimize autoloadMario Vavti2018-10-192-0/+6
| | | | | | | | | | | | | | | (cherry picked from commit 2583270774e2dfe434f7dc099d6ac154fef240dd)
| * | | | strings and bump apd versions to version 2Mario Vavti2018-10-1940-470/+519
| | | | | | | | | | | | | | | (cherry picked from commit 4aed866d69b46e57439b4b9e60301c93f0104995)
| * | | | Merge branch 'patch-18' into 'dev'Mario2018-10-192-10/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Russian translation for upgrade plugin added See merge request hubzilla/core!1344 (cherry picked from commit c044ff34449b10acd072795a02b79d74706c9ca7) ac2b6bcc Russian translation for upgrade plugin added 6e758423 Update hstrings.php
| * | | | Merge branch 'dev' into 'dev'Mario2018-10-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix template root redirection See merge request hubzilla/core!1343 (cherry picked from commit e9471124c00a41bcdd3abe7f1d858b51e5209ca3) 442d1cb4 Fix template root redirection
| * | | | complete changelogMario Vavti2018-10-171-2/+34
| | | | | | | | | | | | | | | (cherry picked from commit fa91e2a60cce1f436b0bec946f4e147bca5752d0)
| * | | | improve posting to mod pconfig via ajaxMario Vavti2018-10-161-5/+9
| | | | | | | | | | | | | | | (cherry picked from commit ae875734e270dbe9840e87f07aa10f11a1af1d89)
| * | | | Merge branch 'fix-master-rate-limiter' into 'dev'Mario2018-10-161-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix master rate limiter See merge request hubzilla/core!1341 (cherry picked from commit e38e85572e148e1cf684810f6435001b32d8c7fc) 49eff772 Fix worker age calculation be30dc9e Move logger to debug/all b6a9be88 Delete duplicate queue items
| * | | | Merge branch 'patch-17' into 'dev'Mario2018-10-162-101/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Russian translations to Newmember widget See merge request hubzilla/core!1339 (cherry picked from commit ed08eb07c63223d09011eab90709d8f3da44f549) 04edb741 Add Russian translations to Newmember widget d2d6f8c9 Update hstrings.php
| * | | | add missing features section to newmember widgetMario Vavti2018-10-151-1/+7
| | | | | | | | | | | | | | | (cherry picked from commit 25a74f366460144d12287b51bdbdb48ebcadfb98)