aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'doku' into 'dev'Mario2019-01-292-146/+249
|\
| * Extend documentation.Klaus Weidenbach2019-01-282-146/+249
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-282-0/+6
| |\
* | | disable hyperdrive in hubzillazotlabs2019-01-281-0/+5
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2019-01-289-213/+234
|\| |
| * | Remove extraneous sync logicM. Dent2019-01-271-12/+2
| * | return false if http signatue is not validMario Vavti2019-01-251-2/+1
| * | Merge branch 'doku' into 'dev'Mario2019-01-254-143/+146
| |\ \
| | * | Correct and extend Doxygen comments.Klaus Weidenbach2019-01-234-143/+146
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-252-1/+37
| |\ \ \
| * | | | macke mod chanview aware of zot6Mario Vavti2019-01-241-1/+1
| | |/ / | |/| |
| * | | Merge branch 'embedphotos' into 'dev'Mario2019-01-221-53/+69
| |\ \ \
| | * | | Try to fix some warnings in Zotlabs\Module\Embedphotos.Klaus Weidenbach2019-01-221-53/+69
| * | | | Add remaining hook insertionsM. Dent2019-01-221-2/+9
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-211-1/+1
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-181-11/+13
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'dreport_fixes' into 'dev'M. Dent2019-01-183-2/+8
| |\ \ \ \ \
| | * | | | | add spaceMario Vavti2019-01-171-1/+1
| | * | | | | fix delivery report for zot6 connectionsMario Vavti2019-01-173-2/+8
* | | | | | | block private reshares from zot6 due to different parentszotlabs2019-01-281-0/+11
| |_|_|_|_|/ |/| | | | |
* | | | | | share fixeszotlabs2019-01-272-0/+6
| |_|_|_|/ |/| | | |
* | | | | support photo items between zot and zot6zotlabs2019-01-242-1/+37
| |_|_|/ |/| | |
* | | | comment permission fixzotlabs2019-01-201-1/+1
| |_|/ |/| |
* | | more specific network checking in several places and remove some old debuggin...zotlabs2019-01-171-11/+13
|/ /
* / channel connect issuezotlabs2019-01-171-1/+1
|/
* event attendance testing continued (now works at a basic level from one direc...zotlabs2019-01-161-1/+1
* more z6 event workzotlabs2019-01-161-1/+27
* 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
| | |_|/ / | |/| | |