aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* use count() instead of sizeof()Mario Vavti2018-12-191-1/+1
* check if we deal with an array before sizeof()Mario Vavti2018-12-191-3/+3
* 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-187-16/+42
|\ \
| * | regression: mail from dev to core not deliveringzotlabs2018-12-172-1/+8
| * | fix default values for affinity tool and other information which could be los...zotlabs2018-12-175-15/+34
* | | Merge branch 'dev' into 'dev'Mario2018-12-171-4/+10
|\ \ \ | | |/ | |/|
| * | Keep remote site headers for cachingMax Kostikov2018-12-171-4/+10
* | | Merge branch 'memory-warn2' into 'dev'Mario2018-12-171-0/+5
|\ \ \
| * | | Update Zotlabs/Module/Setup.phpphani002018-12-161-1/+0
| * | | add warning if upload_filesize < 4MB.phani002018-12-161-0/+6
* | | | 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-1310-438/+493
| |\ \ \
* | \ \ \ Merge branch 'dev' into 'dev'Max Kostikov2018-12-171-6/+5
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Move SSLify code from Photo cache addonMax Kostikov2018-12-171-6/+5
|/ / / /
* | | | Revert Photos.php codeMax Kostikov2018-12-171-245/+1357
* | | | SSLify cached URL on redirect if neededMax Kostikov2018-12-171-1/+3
* | | | SSLify cached URL on redirect if neededMax Kostikov2018-12-171-1357/+245
* | | | Remove photo_cache_enable variableMax Kostikov2018-12-161-1/+1
* | | | Merge branch 'patch-20181214a' into 'dev'Mario2018-12-161-2/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add return if no local_channel()DM42.Net (Matt Dent)2018-12-151-1/+3
| * | | ARTICLES MODULE: Default to local_channel() user when no argv(1) is passed.DM42.Net (Matt Dent)2018-12-141-2/+8
* | | | Merge branch 'dev' into 'dev'M. Dent2018-12-151-1/+1
|\ \ \ \
| * | | | Update OAuth2Storage.php - fix email retrieval in getUserPascal Deklerck2018-12-151-1/+1
|/ / / /
* | | | Merge branch 'custom-item-types' into 'dev'Mario2018-12-156-0/+98
|\ \ \ \
| * | | | Add ITEM_TYPE_CUSTOM and hooks for processing custom item typesDM42.Net (Matt Dent)2018-12-146-0/+98
| |/ / /
* | | | Merge branch 'patch-20181214f' into 'dev'Mario2018-12-151-2/+2
|\ \ \ \
| * | | | Set min/maxversion for plugins to STD_VERSION unless otherwise specifiedDM42.Net (Matt Dent)2018-12-141-2/+2
| |/ / /
* | | | Merge branch 'patch-20181214d' into 'dev'Mario2018-12-153-2/+22
|\ \ \ \
| * | | | Fix syntax errorDM42.Net (Matt Dent)2018-12-142-2/+2
| * | | | Make Affinity Slider (optionally) 'sticky' across page loads. (default is cur...DM42.Net (Matt Dent)2018-12-143-2/+22
| |/ / /
* | | | fix wiki preview issue with hyperlinksMario Vavti2018-12-151-2/+2
* | | | Merge branch 'patch-20181214b' into 'dev'Max Kostikov2018-12-141-1/+1
|\ \ \ \
| * | | | Recreate MR#1419 for dev branchDM42.Net (Matt Dent)2018-12-141-1/+1
| |/ / /
* / / / update changelogMario Vavti2018-12-141-0/+12
|/ / /
* | | fix issue with linkdropperMario Vavti2018-12-141-2/+2
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-145-47/+94
|\| | | |/ |/|
| * regression: the ability to order apps messed up since adding pinned apps to t...zotlabs2018-12-125-47/+94
* | Merge branch 'fix_photo_imagick' into 'dev'Max Kostikov2018-12-111-0/+1
|\ \
| * | return on readImageBlob() exceptionMario Vavti2018-12-111-0/+1
|/ /
* | Merge branch 'photo-hook' into 'dev'M. Dent2018-12-104-3/+16
|\ \
| * | add photo_view_filter hook and fix minor issue with unset auto_save_draft var...Mario Vavti2018-12-104-3/+16
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-105-3/+53
|\ \ \ | | |/ | |/|
| * | home notifications won't expand if there are more than 300 unseen network not...zotlabs2018-12-091-2/+4
| * | rmagic discovery for z6 networkszotlabs2018-12-093-0/+48
| * | total_identities restriction off by onezotlabs2018-12-091-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 06:12:03 +0000