aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2019-01-1613-141/+89
|\
| * change logic for consistencyMario Vavti2019-01-161-3/+6
| * fix legacy zot dreport not passing the is_storable checkMario Vavti2019-01-152-2/+16
| * Remove stray $DM42.Net (Matt Dent)2019-01-131-1/+1
| * Add privacygroup_extras_post/drop hooksDM42.Net (Matt Dent)2019-01-131-1/+8
| * Add pgrp_extras hook & displayDM42.Net (Matt Dent)2019-01-131-0/+5
| * Use dba_driver.php::db_getfunc()DM42.Net (Matt Dent)2019-01-111-10/+2
| * Fix for PGSQL/MYSQL differenceDM42.Net (Matt Dent)2019-01-101-2/+11
| * FIX: memory exhaustion on exceptionally large message queues & multiple Queue...ZotSocial Admin2019-01-101-2/+10
| * do not count removed channelsMario Vavti2019-01-101-1/+1
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-091-1/+3
| |\
| * | Remove Experimental Worker Queue from CORE - add hook 'daemon_master_release'M. Dent2019-01-091-118/+11
| * | Tweak to deal with changes that may happen within the same second.DM42.Net (Matt Dent)2019-01-071-6/+11
| * | fix preg_match(): Delimiter must not be alphanumeric or backslash warningMario Vavti2019-01-021-1/+1
| * | Faster image processing with photo cache addonMax Kostikov2018-12-241-5/+6
| * | Merge branch 'fix_linkinfo_warning' into 'dev'Mario2018-12-221-3/+3
| |\ \
| | * | 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
| * | | do not add timestamp to the photo src. caching is handled in mod photo now.Mario Vavti2018-12-211-1/+1
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-211-1/+1
| |\ \ \
| * | | | missing observer checkMario Vavti2018-12-201-0/+3
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-201-2/+87
| |\ \ \ \
| * | | | | make mod channel deal with b64 encoded mid\sMario Vavti2018-12-181-0/+8
| | |_|/ / | |/| | |
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-184-12/+38
| |\ \ \ \
* | | | | | more work on z6 eventszotlabs2019-01-161-0/+37
* | | | | | more z6 compatibility fixeszotlabs2019-01-163-2/+8
| |_|_|_|/ |/| | | |
* | | | | make Apps::get_base_apps() pluggablezotlabs2019-01-081-1/+3
| |_|_|/ |/| | |
* | | | like permission issuezotlabs2018-12-201-1/+1
| |_|/ |/| |
* | | reverse activity mapping improvementszotlabs2018-12-191-2/+87
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-12-179-16/+56
|\| | | |/ |/|
| * 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
| * | 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
| * | Update OAuth2Storage.php - fix email retrieval in getUserPascal Deklerck2018-12-151-1/+1
| * | 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 remote-tracking branch 'mike/master' into devMario Vavti2018-12-143-30/+47
| |\
* | | regression: mail from dev to core not deliveringzotlabs2018-12-171-1/+6