aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2019-01-212-50/+48
|\
| * Merge branch 'dev' into 'dev'M. Dent2019-01-191-14/+12
| |\
| | * Some fixes in include/help.php.Klaus Weidenbach2019-01-181-14/+12
| * | Fix wrong variable name in include/plugin.php.Klaus Weidenbach2019-01-191-36/+36
| |/
* / this should fix the rest of the event stuffzotlabs2019-01-171-4/+13
|/
* Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2019-01-168-154/+93
|\
| * do not return if delivery report could not bedecryptedMario Vavti2019-01-161-17/+32
| * Merge branch 'patch-20190113a' into 'dev'Mario2019-01-141-2/+17
| |\
| | * 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
| |\
| * | 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
| * | Merge branch 'check_content_type' into 'dev'Max Kostikov2019-01-031-4/+7
| |\ \
| | * | 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
| |\ \ \ | | |/ / | |/| |
| * | | Fix for cURL with default HTTP/2Max Kostikov2018-12-201-13/+4
| * | | Revert "Fix cURL with HTTP/2"Max Kostikov2018-12-201-4/+13
| * | | Fix cURL with HTTP/2Max Kostikov2018-12-201-13/+4
| * | | Merge branch 'dark-fix-dev' into 'dev'Mario2018-12-191-1/+1
| |\ \ \
| | * | | remove some fancy formatting.phani002018-12-181-1/+0
| | * | | new fix for dark themephani002018-12-171-1/+2
| * | | | Merge branch 'dev' into 'dev'Mario2018-12-183-97/+0
| |\ \ \ \
| | * | | | 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
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
* | | | | | more z6 compatibility fixeszotlabs2019-01-161-1/+1
| |_|_|_|/ |/| | | |
* | | | | failure to import mailzotlabs2019-01-101-2/+3
| |_|_|/ |/| | |
* | | | allow notification updates when composing comments. This was disabled when it...zotlabs2019-01-021-3/+3
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-12-172-2/+32
|\| | | | |/ / |/| |
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-171-0/+15
| |\ \ | | |/ | |/|
| * | Merge branch 'custom-item-types' into 'dev'Mario2018-12-151-0/+30
| |\ \
| | * | 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: mail from dev to core not deliveringzotlabs2018-12-171-0/+2
* | | | fix default values for affinity tool and other information which could be los...zotlabs2018-12-171-3/+1
| |_|/ |/| |
* | | 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
|\| | | |/ |/|
| * return on readImageBlob() exceptionMario Vavti2018-12-111-0/+1
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-101-0/+29
| |\
| * \ Merge branch 'dev' into 'dev'Max Kostikov2018-12-041-1/+1
| |\ \
| | * | Create plink depending on message id formatMax Kostikov2018-11-301-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-11 07:30:49 +0000