aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
|\ \ \ | |/ / |/| / | |/
| * 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
| |\
* | | 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
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | 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
* | | 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 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 t...zotlabs2018-12-121-15/+45
* | 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
|\ \ | |/ |/|
| * 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
| * | catch exception if readImageBlob() receives bogus dataMario Vavti2018-12-031-3/+7
| * | Merge branch 'photocache' into 'dev'Max Kostikov2018-12-031-13/+18
| |\ \
| | * | Add Expires field supportMax Kostikov2018-12-031-11/+16
| | * | Add flag to allow to save image without validationMax Kostikov2018-12-021-2/+2
| * | | Merge branch 'photocache' into 'dev'M. Dent2018-12-021-5/+15
| |\| |
| | * | Remove local_channel() check on cache_body_hook callMax Kostikov2018-12-021-9/+7
| | * | Check local_channel() before cache callMax Kostikov2018-11-301-6/+8
| | * | Move cache code to addonMax Kostikov2018-11-301-17/+7
| | * | Fix wrong parameterMax Kostikov2018-11-291-4/+3
| | * | Update text.phpMax Kostikov2018-11-291-5/+0