aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-10-30247-5650/+6481
|\
| * Merge branch 'composer-updates' into 'dev'M. Dent2018-10-31239-5188/+5913
| |\
| | * fix another markdown testMario Vavti2018-10-301-1/+1
| | * fix markdown testsMario Vavti2018-10-302-13/+8
| | * really fix html2markdown() - when using environment, we must set the defaultsMario Vavti2018-10-301-5/+13
| | * fix html2markdown() and re-enable previously failing testsMario Vavti2018-10-302-13/+6
| | * update html_to_markdown, smarty and sabredav libs via composerMario Vavti2018-10-30237-5162/+5891
| * | Merge branch 'forum-ping' into 'dev'M. Dent2018-10-311-4/+3
| |\ \
| | * | fix forum ping results - the term query requires xchan_name instead of xchan_...Mario Vavti2018-10-291-4/+3
| | |/
| * | Merge branch 'wikilist-widget' into 'dev'M. Dent2018-10-312-5/+0
| |\ \ | | |/ | |/|
| | * allow wiki_list widget to be used in any pageMario Vavti2018-10-292-5/+0
| |/
| * changelogMario Vavti2018-10-291-0/+22
| * 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
| |\
| * \ 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
| |/ /
* | | remove primary/clone counts from admin summary. The last checkins should fix ...zotlabs2018-10-301-3/+1
* | | typozotlabs2018-10-301-1/+1
* | | issue syncing the channel_primary setting which shows up as a wrong count on ...zotlabs2018-10-302-19/+17
| |/ |/|
* | delivery chain linkage messed up if original post was editedzotlabs2018-10-261-6/+15
|/
* 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
|\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 08:50:42 +0000