aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'patch-20190113a' into 'dev'Mario2019-01-141-2/+17
|\ | | | | | | | | Add collect_public_recipients hook See merge request hubzilla/core!1467
| * Add collect_public_recipients hookDM42.Net (Matt Dent)2019-01-121-2/+17
| |
* | move order by and rewrite similar in update_queue_item()DM42.Net (Matt Dent)2019-01-132-3/+3
| |
* | outq_created not outq_scheduledDM42.Net (Matt Dent)2019-01-131-1/+1
| |
* | FIX: aggregated query error in MYSQLDM42.Net (Matt Dent)2019-01-131-1/+1
| |
* | FIX: memory exhaustion on zot message pickup with large message queueM. Dent2019-01-121-2/+18
|/
* Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-111-2/+3
|\
| * failure to import mailzotlabs2019-01-101-2/+3
| |
* | we must sslify all possible content variablesMario Vavti2019-01-101-1/+8
| |
* | Update bbcodeMario2019-01-071-14/+3
| |
* | missing closing parenthesisMario Vavti2019-01-031-1/+1
| |
* | fix content type checkMario Vavti2019-01-031-5/+8
| |
* | Revert "Merge branch 'check_content_type' into 'dev'"Max Kostikov2019-01-031-7/+4
| | | | | | This reverts merge request !1453
* | Merge branch 'check_content_type' into 'dev'Max Kostikov2019-01-031-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 headerMario Vavti2019-01-021-4/+7
| | |
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-021-3/+3
|\ \ \ | |/ / |/| / | |/
| * allow notification updates when composing comments. This was disabled when ↵zotlabs2019-01-021-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_mergezotlabs2018-12-172-2/+32
| |\
* | | Fix for cURL with default HTTP/2Max Kostikov2018-12-201-13/+4
| | |
* | | Revert "Fix cURL with HTTP/2"Max Kostikov2018-12-201-4/+13
| | | | | | | | | This reverts commit 090fe394e4733aea9e9ca2e9a93c2c27b266d065
* | | Fix cURL with HTTP/2Max Kostikov2018-12-201-13/+4
| | |
* | | Merge branch 'dark-fix-dev' into 'dev'Mario2018-12-191-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.phani002018-12-181-1/+0
| | | |
| * | | new fix for dark themephani002018-12-171-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'Mario2018-12-183-97/+0
|\ \ \ | | | | | | | | | | | | | | | | Remove scale_external_images() See merge request hubzilla/core!1441
| * | | Remove scale_external_images()Max Kostikov2018-12-171-2/+0
| | | |
| * | | Remove scale_external_images()Max Kostikov2018-12-171-93/+0
| | | |
| * | | Remove scale_external_images()Max Kostikov2018-12-171-2/+0
| | | |
* | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-182-3/+3
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | regression: mail from dev to core not deliveringzotlabs2018-12-171-0/+2
| | |
| * | fix default values for affinity tool and other information which could be ↵zotlabs2018-12-171-3/+1
| | | | | | | | | | | | lost when approving a connection without the entire form provided by connedit.
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-171-0/+15
|\| | | |/ |/|
| * default curl to http/1.1zotlabs2018-12-161-0/+15
| |
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-12-132-1/+2
| |\
* | \ Merge branch 'custom-item-types' into 'dev'Mario2018-12-151-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 typesDM42.Net (Matt Dent)2018-12-141-0/+30
| | | |
* | | | Set min/maxversion for plugins to STD_VERSION unless otherwise specifiedDM42.Net (Matt Dent)2018-12-141-2/+2
|/ / /
* | / Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-141-15/+45
|\| | | |/ |/|
| * regression: the ability to order apps messed up since adding pinned apps to ↵zotlabs2018-12-121-15/+45
| | | | | | | | the ordering
* | return on readImageBlob() exceptionMario Vavti2018-12-111-0/+1
| |
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-101-0/+29
|\|
| * rmagic discovery for z6 networkszotlabs2018-12-091-0/+29
| |
* | Merge branch 'dev' into 'dev'Max Kostikov2018-12-041-1/+1
|\ \ | |/ |/| | | | | Add strings to Russian translation See merge request hubzilla/core!1418
| * Create plink depending on message id formatMax Kostikov2018-11-301-1/+1
| |
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-12-035-27/+48
|\ \
| * | more notifications fixesMario Vavti2018-12-031-1/+1
| | | | | | | | | (cherry picked from commit 9ef6c57ca59aa318a3564f6b48c6442870650d3e)
| * | catch exception if readImageBlob() receives bogus dataMario Vavti2018-12-031-3/+7
| | | | | | | | | (cherry picked from commit 443d7684dbe8c1c3540df5aeb719403d67789747)
| * | Merge branch 'photocache' into 'dev'Max Kostikov2018-12-031-13/+18
| |\ \ | | | | | | | | | | | | | | | | Add flag to allow to save image without validation See merge request hubzilla/core!1416
| | * | Add Expires field supportMax Kostikov2018-12-031-11/+16
| | | |
| | * | Add flag to allow to save image without validationMax Kostikov2018-12-021-2/+2
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-09 08:10:08 +0000