| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | |_|_|_|/ |/| | | | | |||||
| * | | | | | failure to import mail | zotlabs | 2019-01-10 | 1 | -2/+3 |
| | |_|_|/ |/| | | | |||||
| * | | | | allow notification updates when composing comments. This was disabled when ↵ | zotlabs | 2019-01-02 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | it was possible to have liveUpdate run automatically while composing comments, but it seems that live update is no longer possible (however the setting still remains - this should probably be removed). | ||||
| * | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-12-17 | 2 | -2/+32 |
| |\| | | | |/ / |/| | | |||||
| | * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-17 | 1 | -0/+15 |
| | |\ \ | | |/ | |/| | |||||
| | * | | Merge branch 'custom-item-types' into 'dev' | Mario | 2018-12-15 | 1 | -0/+30 |
| | |\ \ | | | | | | | | | | | | | | | | | Add ITEM_TYPE_CUSTOM and hooks for processing custom item types See merge request hubzilla/core!1431 | ||||
| | | * | | Add ITEM_TYPE_CUSTOM and hooks for processing custom item types | DM42.Net (Matt Dent) | 2018-12-14 | 1 | -0/+30 |
| | | | | | |||||
| | * | | | Set min/maxversion for plugins to STD_VERSION unless otherwise specified | DM42.Net (Matt Dent) | 2018-12-14 | 1 | -2/+2 |
| | |/ / | |||||
| | * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-14 | 1 | -15/+45 |
| | |\ \ | |||||
| * | | | | regression: mail from dev to core not delivering | zotlabs | 2018-12-17 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | fix default values for affinity tool and other information which could be ↵ | zotlabs | 2018-12-17 | 1 | -3/+1 |
| | |_|/ |/| | | | | | | | | lost when approving a connection without the entire form provided by connedit. | ||||
| * | | | default curl to http/1.1 | zotlabs | 2018-12-16 | 1 | -0/+15 |
| | | | | |||||
| * | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-12-13 | 2 | -1/+2 |
| |\| | | |/ |/| | |||||
| | * | return on readImageBlob() exception | Mario Vavti | 2018-12-11 | 1 | -0/+1 |
| | | | |||||
| | * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-10 | 1 | -0/+29 |
| | |\ | |||||
| | * \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2018-12-04 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | Add strings to Russian translation See merge request hubzilla/core!1418 | ||||
| | | * | | Create plink depending on message id format | Max Kostikov | 2018-11-30 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | regression: the ability to order apps messed up since adding pinned apps to ↵ | zotlabs | 2018-12-12 | 1 | -15/+45 |
| | |_|/ |/| | | | | | | | | the ordering | ||||
| * | | | rmagic discovery for z6 networks | zotlabs | 2018-12-09 | 1 | -0/+29 |
| |/ / | |||||
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-12-03 | 5 | -27/+48 |
| |\ \ | |||||
| | * | | more notifications fixes | Mario Vavti | 2018-12-03 | 1 | -1/+1 |
| | | | | | | | | | | (cherry picked from commit 9ef6c57ca59aa318a3564f6b48c6442870650d3e) | ||||
| | * | | catch exception if readImageBlob() receives bogus data | Mario Vavti | 2018-12-03 | 1 | -3/+7 |
| | | | | | | | | | | (cherry picked from commit 443d7684dbe8c1c3540df5aeb719403d67789747) | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |