| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-10-30 | 247 | -5650/+6481 |
| |\ | |||||
| | * | Merge branch 'composer-updates' into 'dev' | M. Dent | 2018-10-31 | 239 | -5188/+5913 |
| | |\ | | | | | | | | | | | | | update html_to_markdown, smarty and sabredav libs via composer See merge request hubzilla/core!1361 | ||||
| | | * | fix another markdown test | Mario Vavti | 2018-10-30 | 1 | -1/+1 |
| | | | | |||||
| | | * | fix markdown tests | Mario Vavti | 2018-10-30 | 2 | -13/+8 |
| | | | | |||||
| | | * | really fix html2markdown() - when using environment, we must set the defaults | Mario Vavti | 2018-10-30 | 1 | -5/+13 |
| | | | | |||||
| | | * | fix html2markdown() and re-enable previously failing tests | Mario Vavti | 2018-10-30 | 2 | -13/+6 |
| | | | | |||||
| | | * | update html_to_markdown, smarty and sabredav libs via composer | Mario Vavti | 2018-10-30 | 237 | -5162/+5891 |
| | | | | |||||
| | * | | Merge branch 'forum-ping' into 'dev' | M. Dent | 2018-10-31 | 1 | -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 Vavti | 2018-10-29 | 1 | -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. Dent | 2018-10-31 | 2 | -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 page | Mario Vavti | 2018-10-29 | 2 | -5/+0 |
| | |/ | |||||
| | * | changelog | Mario Vavti | 2018-10-29 | 1 | -0/+22 |
| | | | |||||
| | * | Merge branch 'dev' into 'dev' | M. Dent | 2018-10-28 | 2 | -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 Vavti | 2018-10-27 | 2 | -10/+24 |
| | |/ | |||||
| | * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-10-27 | 1 | -6/+15 |
| | |\ | |||||
| | * \ | Merge branch 'dev' into 'dev' | M. Dent | 2018-10-26 | 1 | -6/+8 |
| | |\ \ | | | | | | | | | | | | | | | | | notifications: fix unseen forum count See merge request hubzilla/core!1351 | ||||
| | | * | | notifications: fix unseen forum count | Mario Vavti | 2018-10-26 | 1 | -6/+8 |
| | |/ / | |||||
| | * | | Merge branch 'dev' into 'dev' | Mario | 2018-10-26 | 2 | -443/+516 |
| | |\ \ | | | | | | | | | | | | | | | | | New strings in Spanish translation See merge request hubzilla/core!1349 | ||||
| | | * | | New strings in Spanish translation | Manuel Jiménez Friaza | 2018-10-25 | 2 | -443/+516 |
| | | | | | |||||
| | * | | | Merge branch 'patch-20181025a' into 'dev' | Mario | 2018-10-26 | 1 | -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 tasks | M.Dent | 2018-10-25 | 1 | -2/+3 |
| | |/ / | |||||
| * | | | remove primary/clone counts from admin summary. The last checkins should fix ↵ | zotlabs | 2018-10-30 | 1 | -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. | ||||
| * | | | typo | zotlabs | 2018-10-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | issue syncing the channel_primary setting which shows up as a wrong count on ↵ | zotlabs | 2018-10-30 | 2 | -19/+17 |
| | |/ |/| | | | | | the admin summary page | ||||
| * | | delivery chain linkage messed up if original post was edited | zotlabs | 2018-10-26 | 1 | -6/+15 |
| |/ | |||||
| * | Merge branch 'dev' into 'dev' | M. Dent | 2018-10-25 | 9 | -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 dev | Mario Vavti | 2018-10-24 | 1 | -2/+2 |
| | |\ | |/ |/| | |||||
| * | | Merge branch 'patch-19' into 'dev' | Mario | 2018-10-24 | 1 | -2/+2 |
| |\ \ | | | | | | | | | | | | | Convert non UTF-8 content on link embeding See merge request hubzilla/core!1347 | ||||
| | * | | Update Linkinfo.php | Max Kostikov | 2018-10-24 | 1 | -1/+1 |
| | | | | |||||
| | * | | Update Linkinfo.php | Max Kostikov | 2018-10-23 | 1 | -1/+1 |
| | | | | |||||
| | * | | Update Linkinfo.php | Max Kostikov | 2018-10-23 | 1 | -4/+2 |
| | | | | |||||
| | * | | Convert non UTF-8 content on link embeding | Max Kostikov | 2018-10-23 | 1 | -2/+4 |
| |/ / | |||||
| | * | fix get on {1} | Mario Vavti | 2018-10-24 | 1 | -1/+1 |
| | | | |||||
| | * | refine stream filter and forum notification behaviour (mostly for ↵ | Mario Vavti | 2018-10-24 | 6 | -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 var | Mario Vavti | 2018-10-24 | 1 | -1/+1 |
| | | | |||||
| | * | autocomplete performance: this slightly changes the editor contact ↵ | Mario Vavti | 2018-10-24 | 2 | -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 dev | Mario Vavti | 2018-10-23 | 56 | -10173/+0 |
| |\ | |||||
| | * | for whatever reason there were two of these | zotlabs | 2018-10-22 | 56 | -10173/+0 |
| | | | |||||
| * | | textcomplete: return up to 100 items and look for for matches in the entire ↵ | Mario Vavti | 2018-10-22 | 2 | -12/+34 |
| | | | | | | | | | string (not just the beginning) when suggesting emojis | ||||
| * | | add summary to bbcode autocomplete list | Mario Vavti | 2018-10-22 | 1 | -2/+2 |
| | | | |||||
| * | | update blueimp_upload to version 9.23 | Mario Vavti | 2018-10-22 | 24 | -659/+989 |
| |/ | |||||
| * | changelog for 3.8.1 | Mario Vavti | 2018-10-21 | 1 | -0/+6 |
| | | |||||
| * | fix ellipsis for too long nav banner | Mario Vavti | 2018-10-21 | 1 | -0/+5 |
| | | |||||
| * | Merge branch 'edit-menu-contents-fix' into 'dev' | Mario | 2018-10-21 | 1 | -1/+1 |
| |\ | | | | | | | | | fix wrong value being used for menu_id See merge request hubzilla/core!1345 | ||||
| | * | fix wrong value being used for menu_id | mike | 2018-10-20 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-10-21 | 1 | -15/+0 |
| |\ \ | |/ |/| | |||||
| | * | disable blueimp demo server | zotlabs | 2018-10-20 | 1 | -15/+0 |
| | | | |||||
| * | | bump version | Mario Vavti | 2018-10-19 | 1 | -1/+1 |
| | | | |||||
| * | | optimize autoload | Mario Vavti | 2018-10-19 | 2 | -0/+6 |
| | | | |||||
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-10-19 | 2 | -10/+47 |
| |\ \ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |