aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'patch-19' into 'dev'Mario2018-10-241-2/+2
|\ | | | | | | | | Convert non UTF-8 content on link embeding See merge request hubzilla/core!1347
| * Update Linkinfo.phpMax Kostikov2018-10-241-1/+1
| |
| * Update Linkinfo.phpMax Kostikov2018-10-231-1/+1
| |
| * Update Linkinfo.phpMax Kostikov2018-10-231-4/+2
| |
| * Convert non UTF-8 content on link embedingMax Kostikov2018-10-231-2/+4
|/
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-10-2356-10173/+0
|\
| * for whatever reason there were two of thesezotlabs2018-10-2256-10173/+0
| |
* | textcomplete: return up to 100 items and look for for matches in the entire ↵Mario Vavti2018-10-222-12/+34
| | | | | | | | string (not just the beginning) when suggesting emojis
* | add summary to bbcode autocomplete listMario Vavti2018-10-221-2/+2
| |
* | update blueimp_upload to version 9.23Mario Vavti2018-10-2224-659/+989
|/
* changelog for 3.8.1Mario Vavti2018-10-211-0/+6
|
* fix ellipsis for too long nav bannerMario Vavti2018-10-211-0/+5
|
* Merge branch 'edit-menu-contents-fix' into 'dev'Mario2018-10-211-1/+1
|\ | | | | | | | | fix wrong value being used for menu_id See merge request hubzilla/core!1345
| * fix wrong value being used for menu_idmike2018-10-201-1/+1
| |
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-10-211-15/+0
|\ \ | |/ |/|
| * disable blueimp demo serverzotlabs2018-10-201-15/+0
| |
* | bump versionMario Vavti2018-10-191-1/+1
| |
* | optimize autoloadMario Vavti2018-10-192-0/+6
| |
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-10-192-10/+47
|\ \
| * \ Merge branch 'patch-18' into 'dev'Mario2018-10-192-10/+47
| |\ \ | | | | | | | | | | | | | | | | Russian translation for upgrade plugin added See merge request hubzilla/core!1344
| | * | Update hstrings.phpMax Kostikov2018-10-181-0/+7
| | | |
| | * | Russian translation for upgrade plugin addedMax Kostikov2018-10-181-10/+40
| |/ /
* / / 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
|/ / /