aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)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
| |\ | | | | | | | | | | | | update html_to_markdown, smarty and sabredav libs via composer See merge request hubzilla/core!1361
| | * 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… See merge request hubzilla/core!1358
| | * | fix forum ping results - the term query requires xchan_name instead of ↵Mario Vavti2018-10-291-4/+3
| | |/ | | | | | | | | | xchan_hash. also improve the query itself - item_permission_sql() is redundant here since we always deal with local_channel() and use count(id) instead of sum(item_unseen) to get the unseen count
| * | Merge branch 'wikilist-widget' into 'dev'M. Dent2018-10-312-5/+0
| |\ \ | | |/ | |/| | | | | | | allow wiki_list widget to be used in any page See merge request hubzilla/core!1359
| | * 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. See merge request hubzilla/core!1354
| | * 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 count See merge request hubzilla/core!1351
| | * | notifications: fix unseen forum countMario Vavti2018-10-261-6/+8
| |/ /
| * | Merge branch 'dev' into 'dev'Mario2018-10-262-443/+516
| |\ \ | | | | | | | | | | | | | | | | New strings in Spanish translation See merge request hubzilla/core!1349
| | * | 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 tasks See merge request hubzilla/core!1350
| | * | 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
| | | | | | | | | | | | this count "eventually" but the information has little direct value and may require location information for a local channel to change before it is actually corrected.
* | | typozotlabs2018-10-301-1/+1
| | |
* | | issue syncing the channel_primary setting which shows up as a wrong count on ↵zotlabs2018-10-302-19/+17
| |/ |/| | | | | the admin summary page
* | 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
|\ | | | | | | | | Editor contact autocomplete performance & refine stream filter and forum notification behaviour (mostly for performance) See merge request hubzilla/core!1348
| * 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
|\ \ | | | | | | | | | | | | 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
|/ /
| * fix get on {1}Mario Vavti2018-10-241-1/+1
| |
| * refine stream filter and forum notification behaviour (mostly for ↵Mario Vavti2018-10-246-53/+66
| | | | | | | | performance). personal posts will be displayed in unthreaded mode and clicking a forum notification will show only the unseen items of the forum in unthreaded mode. group the filters in the widget - threaded at the top, unthreaded beneath.
| * wrong varMario Vavti2018-10-241-1/+1
| |
| * autocomplete performance: this slightly changes the editor contact ↵Mario Vavti2018-10-242-5/+6
|/ | | | autocomplete behaviour. queries using *like* with a prepended % to the query string do not make use of indices. this is no big issue when we query abook but can get really slow when xchan table is involved. this commit changes the xchan table only queries to use the *str%* format. this means that the result set for channels we are not connected with will change in a way that xchan_name and xchan_addr will bematched only from the beginning of the name or address. this commit also changes textcomplete to only start the query after the 3rd character. the result set between 2 and 3 characters is mostly very different and only from 3 chars on there is a high possibility the channel we look for is already in the result.
* 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
|\ \