| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-11-04 | 5 | -8/+13 |
| |\ | |||||
| | * | Merge branch 'dev' into 'dev' | Mario | 2018-11-03 | 1 | -1/+1 |
| | |\ | | | | | | | | | | | | | Fixed typo at view/es-es/hstrings.php See merge request hubzilla/core!1366 | ||||
| | | * | Fixed typo at view/es-es/hstrings.php | Manuel Jiménez Friaza | 2018-11-03 | 1 | -1/+1 |
| | |/ | |||||
| | * | Merge branch 'patch-3' into 'dev' | Mario | 2018-11-03 | 1 | -3/+3 |
| | |\ | | | | | | | | | | | | | Update hmessages.po See merge request hubzilla/core!1365 | ||||
| | | * | Update hmessages.po | gia vec | 2018-11-02 | 1 | -3/+3 |
| | | | | |||||
| | * | | Merge branch 'patch-2' into 'dev' | Mario | 2018-11-03 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | Update hstrings.php See merge request hubzilla/core!1364 | ||||
| | | * | | Update hstrings.php | gia vec | 2018-11-02 | 1 | -1/+1 |
| | | |/ | |||||
| | * | | Merge branch 'patch-22' into 'dev' | Mario | 2018-11-03 | 1 | -1/+6 |
| | |\ \ | | |/ | |/| | | | | | | | More precise content encoding detection on conversion See merge request hubzilla/core!1363 | ||||
| | | * | Update Linkinfo.php | Max Kostikov | 2018-11-03 | 1 | -1/+1 |
| | | | | |||||
| | | * | Update Linkinfo.php | Max Kostikov | 2018-11-03 | 1 | -1/+1 |
| | | | | |||||
| | | * | Update Linkinfo.php | Max Kostikov | 2018-11-03 | 1 | -4/+4 |
| | | | | |||||
| | | * | Update Linkinfo.php | Max Kostikov | 2018-11-02 | 1 | -2/+2 |
| | | | | |||||
| | | * | more precise codepage detection | Max Kostikov | 2018-11-02 | 1 | -3/+5 |
| | | | | |||||
| | | * | Workaround for incorrect ISO-8859-5 encoded content conversion | Max Kostikov | 2018-11-02 | 1 | -2/+5 |
| | |/ | |||||
| | * | Merge branch 'patch-21' into 'dev' | Mario | 2018-11-02 | 1 | -2/+2 |
| | |\ | | | | | | | | | | | | | Fix wrong image resize for some external images See merge request hubzilla/core!1362 | ||||
| | | * | Fix wrong image resize for some external images | Max Kostikov | 2018-11-01 | 1 | -2/+2 |
| | |/ | |||||
| * / | z6 updates to owa, linkinfo improved image detection | zotlabs | 2018-11-04 | 2 | -11/+36 |
| |/ | |||||
| * | css fix for reshared-content images and whitespace | Mario Vavti | 2018-10-31 | 1 | -3/+14 |
| | | |||||
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-10-31 | 1 | -1/+6 |
| |\ | |||||
| | * | Merge branch 'patch-20' into 'dev' | Mario | 2018-10-31 | 1 | -1/+6 |
| | |\ | | | | | | | | | | | | | Beautiful embedding for Hubzilla links See merge request hubzilla/core!1360 | ||||
| | | * | Update oembed.php | Max Kostikov | 2018-10-30 | 1 | -1/+5 |
| | | | | |||||
| | | * | Beautiful embedding for Hubzilla links | Max Kostikov | 2018-10-30 | 1 | -1/+2 |
| | | | | |||||
| * | | | yet another blueimp vulnerability. Move to composer. | Mike Macgirvin | 2018-10-31 | 67 | -63/+509 |
| | | | | |||||
| * | | | 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 |
| | |\ | |/ |/| | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |