aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge Zotlabs/Widget/Wiki_pages.php from devMario Vavti2018-10-291-2/+0
* merge Zotlabs/Module/Photo.php from devMario Vavti2018-10-291-12/+0
* Merge branch 'dev'Mario Vavti2018-10-2938-749/+1141
|\
| * Merge branch 'dev' into 'dev'M. Dent2018-10-282-10/+24
| |\
| | * fix issues with forum handling in mod network and ping. also some code cleanup.Mario Vavti2018-10-272-10/+24
| |/
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-10-271-6/+15
| |\
| | * delivery chain linkage messed up if original post was editedzotlabs2018-10-261-6/+15
| * | Merge branch 'dev' into 'dev'M. Dent2018-10-261-6/+8
| |\ \
| | * | notifications: fix unseen forum countMario Vavti2018-10-261-6/+8
| |/ /
| * | Merge branch 'dev' into 'dev'Mario2018-10-262-443/+516
| |\ \
| | * | New strings in Spanish translationManuel Jiménez Friaza2018-10-252-443/+516
| | |/
| * | Merge branch 'patch-20181025a' into 'dev'Mario2018-10-261-2/+3
| |\ \ | | |/ | |/|
| | * Add entropy to queue worker - and fix requeuing of expired tasksM.Dent2018-10-251-2/+3
| |/
| * 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
| |\ \ \ | | |/ / | |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 19:25:24 +0000