Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | fix ellipsis for too long nav banner | Mario Vavti | 2018-10-21 | 1 | -0/+5 | |
| | ||||||
* | Merge branch 'edit-menu-contents-fix' into 'dev' | Mario | 2018-10-21 | 1 | -1/+1 | |
|\ | | | | | | | | | fix wrong value being used for menu_id See merge request hubzilla/core!1345 | |||||
| * | fix wrong value being used for menu_id | mike | 2018-10-20 | 1 | -1/+1 | |
| | | ||||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-10-21 | 1 | -15/+0 | |
|\ \ | |/ |/| | ||||||
| * | disable blueimp demo server | zotlabs | 2018-10-20 | 1 | -15/+0 | |
| | | ||||||
* | | bump version | Mario Vavti | 2018-10-19 | 1 | -1/+1 | |
| | | ||||||
* | | optimize autoload | Mario Vavti | 2018-10-19 | 2 | -0/+6 | |
| | | ||||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-10-19 | 2 | -10/+47 | |
|\ \ | ||||||
| * \ | Merge branch 'patch-18' into 'dev' | Mario | 2018-10-19 | 2 | -10/+47 | |
| |\ \ | | | | | | | | | | | | | | | | | Russian translation for upgrade plugin added See merge request hubzilla/core!1344 | |||||
| | * | | Update hstrings.php | Max Kostikov | 2018-10-18 | 1 | -0/+7 | |
| | | | | ||||||
| | * | | Russian translation for upgrade plugin added | Max Kostikov | 2018-10-18 | 1 | -10/+40 | |
| |/ / | ||||||
* / / | strings and bump apd versions to version 2 | Mario Vavti | 2018-10-19 | 40 | -470/+519 | |
|/ / | ||||||
* | | Merge branch 'dev' into 'dev' | Mario | 2018-10-18 | 1 | -1/+2 | |
|\ \ | | | | | | | | | | | | | Fix template root redirection See merge request hubzilla/core!1343 | |||||
| * | | Fix template root redirection | M.Dent | 2018-10-17 | 1 | -1/+2 | |
|/ / | ||||||
* | | complete changelog | Mario Vavti | 2018-10-17 | 1 | -2/+34 | |
| | | ||||||
* | | Merge branch 'fix-master-rate-limiter' into 'dev' | Mario | 2018-10-16 | 1 | -2/+9 | |
|\ \ | | | | | | | | | | | | | Fix master rate limiter See merge request hubzilla/core!1341 | |||||
| * | | Fix master rate limiter | M. Dent | 2018-10-16 | 1 | -2/+9 | |
|/ / | ||||||
* | | Merge branch 'dev' into 'dev' | M. Dent | 2018-10-16 | 1 | -5/+9 | |
|\ \ | | | | | | | | | | | | | improve posting to mod pconfig via ajax See merge request hubzilla/core!1340 | |||||
| * | | improve posting to mod pconfig via ajax | Mario Vavti | 2018-10-16 | 1 | -5/+9 | |
| | | | ||||||
* | | | Merge branch 'patch-17' into 'dev' | Mario | 2018-10-16 | 2 | -101/+116 | |
|\ \ \ | |/ / |/| | | | | | | | | Add Russian translations to Newmember widget See merge request hubzilla/core!1339 | |||||
| * | | Update hstrings.php | Max Kostikov | 2018-10-15 | 1 | -0/+3 | |
| | | | ||||||
| * | | Add Russian translations to Newmember widget | Max Kostikov | 2018-10-15 | 1 | -101/+113 | |
|/ / | ||||||
* | | add missing features section to newmember widget | Mario Vavti | 2018-10-15 | 1 | -1/+7 | |
| | | ||||||
* | | allow to undelete deleted base apps | Mario Vavti | 2018-10-15 | 1 | -2/+2 | |
| | | ||||||
* | | some changelog work | Mario Vavti | 2018-10-15 | 1 | -1/+68 | |
| | | ||||||
* | | fix wiki issue with wiki page links when using bbcode | Mario Vavti | 2018-10-15 | 1 | -3/+2 | |
| | | ||||||
* | | update readme for master and dev branch buildstatus | Mario Vavti | 2018-10-15 | 1 | -1/+4 | |
| | | ||||||
* | | Merge branch 'dev' into 'dev' | Mario | 2018-10-15 | 5 | -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-marijus | 2018-10-13 | 2 | -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_pdoTest | git-marijus | 2018-10-13 | 1 | -2/+2 | |
| | | | ||||||
| * | | add gitlab-ci.yml and phpunit.xml | git-marijus | 2018-10-13 | 2 | -0/+78 | |
| | | | ||||||
* | | | Merge branch 'patch-16' into 'dev' | Mario | 2018-10-15 | 3 | -8/+9 | |
|\ \ \ | | | | | | | | | | | | | | | | | JS plurals displaying code cleanup See merge request hubzilla/core!1338 | |||||
| * | | | Update main.js | Max Kostikov | 2018-10-14 | 1 | -6/+7 | |
| | | | | ||||||
| * | | | Update main.js | Max Kostikov | 2018-10-14 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Update language.php | Max Kostikov | 2018-10-14 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | JS plurals displaying code cleanup | Max Kostikov | 2018-10-14 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge branch 'patch-15' into 'dev' | Mario | 2018-10-15 | 1 | -0/+1 | |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | Add JS function code for plurals translation in Russian See merge request hubzilla/core!1337 | |||||
| * | | | Update hstrings.php | Max Kostikov | 2018-10-14 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Add JS function code for plurals translation | Max Kostikov | 2018-10-14 | 1 | -0/+1 | |
|/ / / | ||||||
* | | | min version bump | Mario Vavti | 2018-10-13 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'patch-14' into 'dev' | Mario | 2018-10-13 | 5 | -27/+65 | |
|\ \ \ | | | | | | | | | | | | | | | | | Add date/time plurals translation in JavaScript See merge request hubzilla/core!1336 | |||||
| * | | | Update js_strings.php | Max Kostikov | 2018-10-13 | 1 | -5/+5 | |
| | | | | ||||||
| * | | | Update po2php.php | Max Kostikov | 2018-10-13 | 1 | -2/+3 | |
| | | | | ||||||
| * | | | Update main.js | Max Kostikov | 2018-10-13 | 1 | -19/+21 | |
| | | | | ||||||
| * | | | Update js_strings.tpl | Max Kostikov | 2018-10-13 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Update language.php | Max Kostikov | 2018-10-13 | 1 | -0/+26 | |
| | | | | ||||||
| * | | | Add date/time plurals translation in JavaScript | Max Kostikov | 2018-10-13 | 1 | -0/+9 | |
|/ / / | ||||||
* | | | Revert "Merge branch 'patch-11' into 'dev'" | Mario Vavti | 2018-10-13 | 4 | -65/+25 | |
| | | | | | | | | | | | | | | | This reverts commit e5184458530bb0394e12026c82ee89257115f690, reversing changes made to 8ce240b95c62f4b702b60977f63b0223a8ec0849. | |||||
* | | | Merge branch 'patch-12' into 'dev' | Mario | 2018-10-13 | 2 | -103/+138 | |
|\ \ \ | | | | | | | | | | | | | | | | | New russian plurals for JavaScript See merge request hubzilla/core!1333 | |||||
| * | | | Update hmessages.po | Max Kostikov | 2018-10-13 | 1 | -2/+2 | |
| | | | |