| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2019-02-07 | 2 | -6/+15 |
| |\ | |||||
| | * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-02-04 | 4 | -60/+108 |
| | |\ | |||||
| | * \ | Merge branch 'patch-20190201a' into 'dev' | Mario | 2019-02-02 | 1 | -5/+14 |
| | |\ \ | | | | | | | | | | | | | | | | | Add filter hooks and the ability to add buttons to the default status editor See merge request hubzilla/core!1502 | ||||
| | | * | | Add filter hooks and the ability to add buttons to the default status editor | DM42.Net (Matt Dent) | 2019-02-01 | 1 | -5/+14 |
| | | | | | |||||
| | * | | | Merge branch 'dev' into 'dev' | M. Dent | 2019-02-01 | 1 | -1/+1 |
| | |\ \ \ | | |/ / | |/| | | | | | | | | | | Prevent Hubzilla usage for SEO backlinks See merge request hubzilla/core!1501 | ||||
| | | * | | Prevent Hubzilla usage for SEO backlinks | Max Kostikov | 2019-02-01 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | add missing zot6 conversation completion (required for message repeats) | zotlabs | 2019-02-07 | 1 | -0/+19 |
| | |_|/ |/| | | |||||
| * | | | fix linkify_tags() so it works with xchans across multiple protocols, also ↵ | zotlabs | 2019-02-03 | 4 | -60/+108 |
| |/ / | | | | | | | some fixes to activity parsing from upstream. | ||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-30 | 1 | -0/+12 |
| |\ \ | |||||
| | * | | cache embeds in the background on initial storage rather than on first access | zotlabs | 2019-01-29 | 1 | -0/+12 |
| | | | | |||||
| * | | | Extend documentation. | Klaus Weidenbach | 2019-01-28 | 1 | -24/+16 |
| |/ / | |||||
| * | | Correct and extend Doxygen comments. | Klaus Weidenbach | 2019-01-23 | 8 | -130/+205 |
| | | | | | | | | | | | | | Correct some documentation errors for Doxygen and add more comments. Document some undefined variables with @FIXME. | ||||
| * | | Merge branch 'prepare_text' into 'dev' | Mario | 2019-01-23 | 1 | -27/+34 |
| |\ \ | | | | | | | | | | | | | Correct parameter in include/text.php prepare_text() See merge request hubzilla/core!1483 | ||||
| | * | | Correct parameter in include/text.php prepare_text() | Klaus Weidenbach | 2019-01-22 | 1 | -27/+34 |
| | | | | | | | | | | | | | Also extend documentation. | ||||
| * | | | Merge branch 'dev' into 'dev' | Mario | 2019-01-23 | 1 | -0/+3 |
| |\ \ \ | |/ / |/| / | |/ | | | Skip tags detection in URL See merge request hubzilla/core!1482 | ||||
| | * | Skip tags detection in URL | Max Kostikov | 2019-01-22 | 1 | -0/+3 |
| | | | |||||
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2019-01-21 | 2 | -50/+48 |
| |\ \ | |||||
| | * \ | Merge branch 'dev' into 'dev' | M. Dent | 2019-01-19 | 1 | -14/+12 |
| | |\ \ | | | | | | | | | | | | | | | | | Some fixes in include/help.php. See merge request hubzilla/core!1479 | ||||
| | | * | | Some fixes in include/help.php. | Klaus Weidenbach | 2019-01-18 | 1 | -14/+12 |
| | | | | | | | | | | | | | | | | | Remove unused variables and a wrong function name. | ||||
| | * | | | Fix wrong variable name in include/plugin.php. | Klaus Weidenbach | 2019-01-19 | 1 | -36/+36 |
| | |/ / | |||||
| * / / | this should fix the rest of the event stuff | zotlabs | 2019-01-17 | 1 | -4/+13 |
| |/ / | |||||
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2019-01-16 | 8 | -154/+93 |
| |\ \ | |||||
| | * | | do not return if delivery report could not bedecrypted | Mario Vavti | 2019-01-16 | 1 | -17/+32 |
| | | | | |||||
| | * | | Merge branch 'patch-20190113a' into 'dev' | Mario | 2019-01-14 | 1 | -2/+17 |
| | |\ \ | | | | | | | | | | | | | | | | | Add collect_public_recipients hook See merge request hubzilla/core!1467 | ||||
| | | * | | Add collect_public_recipients hook | DM42.Net (Matt Dent) | 2019-01-12 | 1 | -2/+17 |
| | | | | | |||||
| | * | | | move order by and rewrite similar in update_queue_item() | DM42.Net (Matt Dent) | 2019-01-13 | 2 | -3/+3 |
| | | | | | |||||
| | * | | | outq_created not outq_scheduled | DM42.Net (Matt Dent) | 2019-01-13 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | FIX: aggregated query error in MYSQL | DM42.Net (Matt Dent) | 2019-01-13 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | FIX: memory exhaustion on zot message pickup with large message queue | M. Dent | 2019-01-12 | 1 | -2/+18 |
| | |/ / | |||||
| | * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-11 | 1 | -2/+3 |
| | |\ \ | |||||
| | * | | | we must sslify all possible content variables | Mario Vavti | 2019-01-10 | 1 | -1/+8 |
| | | | | | |||||
| | * | | | Update bbcode | Mario | 2019-01-07 | 1 | -14/+3 |
| | | | | | |||||
| | * | | | missing closing parenthesis | Mario Vavti | 2019-01-03 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | fix content type check | Mario Vavti | 2019-01-03 | 1 | -5/+8 |
| | | | | | |||||
| | * | | | Revert "Merge branch 'check_content_type' into 'dev'" | Max Kostikov | 2019-01-03 | 1 | -7/+4 |
| | | | | | | | | | | | | | This reverts merge request !1453 | ||||
| | * | | | Merge branch 'check_content_type' into 'dev' | Max Kostikov | 2019-01-03 | 1 | -4/+7 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | check suppported type if we get content type from header See merge request hubzilla/core!1453 | ||||
| | | * | | | check suppported type if we get content type from header | Mario Vavti | 2019-01-02 | 1 | -4/+7 |
| | | | |/ | | |/| | |||||
| | * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-02 | 1 | -3/+3 |
| | |\ \ \ | | |/ / | |/| | | |||||
| | * | | | Fix for cURL with default HTTP/2 | Max Kostikov | 2018-12-20 | 1 | -13/+4 |
| | | | | | |||||
| | * | | | Revert "Fix cURL with HTTP/2" | Max Kostikov | 2018-12-20 | 1 | -4/+13 |
| | | | | | | | | | | | | | This reverts commit 090fe394e4733aea9e9ca2e9a93c2c27b266d065 | ||||
| | * | | | Fix cURL with HTTP/2 | Max Kostikov | 2018-12-20 | 1 | -13/+4 |
| | | | | | |||||
| | * | | | Merge branch 'dark-fix-dev' into 'dev' | Mario | 2018-12-19 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | fix for dark theme; includes one changes to bbcode.php and redbasic/css/style.css See merge request hubzilla/core!1442 | ||||
| | | * | | | remove some fancy formatting. | phani00 | 2018-12-18 | 1 | -1/+0 |
| | | | | | | |||||
| | | * | | | new fix for dark theme | phani00 | 2018-12-17 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change implementation of hl-tags in include/bbcode.php insert class='default-highlight' instead of background-color: 'yellow' into span add span.default-highlight definition to view/theme/redbasic/css/style.css this works for all schemas incl. dark. | ||||
| | * | | | | Merge branch 'dev' into 'dev' | Mario | 2018-12-18 | 3 | -97/+0 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove scale_external_images() See merge request hubzilla/core!1441 | ||||
| | | * | | | | Remove scale_external_images() | Max Kostikov | 2018-12-17 | 1 | -2/+0 |
| | | | | | | | |||||
| | | * | | | | Remove scale_external_images() | Max Kostikov | 2018-12-17 | 1 | -93/+0 |
| | | | | | | | |||||
| | | * | | | | Remove scale_external_images() | Max Kostikov | 2018-12-17 | 1 | -2/+0 |
| | | | | | | | |||||
| | * | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-18 | 2 | -3/+3 |
| | |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | | more z6 compatibility fixes | zotlabs | 2019-01-16 | 1 | -1/+1 |
| | |_|_|_|/ |/| | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |