aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into 'dev'M. Dent2018-10-259-58/+72
|\
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-10-241-2/+2
| |\ | |/ |/|
* | Merge branch 'patch-19' into 'dev'Mario2018-10-241-2/+2
|\ \
| * | 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
|/ /
| * fix get on {1}Mario Vavti2018-10-241-1/+1
| * refine stream filter and forum notification behaviour (mostly for performance...Mario Vavti2018-10-246-53/+66
| * wrong varMario Vavti2018-10-241-1/+1
| * autocomplete performance: this slightly changes the editor contact autocomple...Mario Vavti2018-10-242-5/+6
|/
* 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 s...Mario Vavti2018-10-222-12/+34
* | 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_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
| |\ \
| | * | 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 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 limiterM. Dent2018-10-161-2/+9
|/ /
* | Merge branch 'dev' into 'dev'M. Dent2018-10-161-5/+9
|\ \
| * | improve posting to mod pconfig via ajaxMario Vavti2018-10-161-5/+9
* | | Merge branch 'patch-17' into 'dev'Mario2018-10-162-101/+116
|\ \ \ | |/ / |/| |
| * | 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
|\ \
| * | 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