| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-28 | 2 | -0/+6 |
|\ |
|
| * | share fixes | zotlabs | 2019-01-27 | 2 | -0/+6 |
* | | Remove extraneous sync logic | M. Dent | 2019-01-27 | 1 | -12/+2 |
* | | return false if http signatue is not valid | Mario Vavti | 2019-01-25 | 1 | -2/+1 |
* | | Merge branch 'doku' into 'dev' | Mario | 2019-01-25 | 4 | -143/+146 |
|\ \ |
|
| * | | Correct and extend Doxygen comments. | Klaus Weidenbach | 2019-01-23 | 4 | -143/+146 |
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-25 | 2 | -1/+37 |
|\ \ \
| | |/
| |/| |
|
| * | | support photo items between zot and zot6 | zotlabs | 2019-01-24 | 2 | -1/+37 |
* | | | macke mod chanview aware of zot6 | Mario Vavti | 2019-01-24 | 1 | -1/+1 |
| |/
|/| |
|
* | | Merge branch 'embedphotos' into 'dev' | Mario | 2019-01-22 | 1 | -53/+69 |
|\ \ |
|
| * | | Try to fix some warnings in Zotlabs\Module\Embedphotos. | Klaus Weidenbach | 2019-01-22 | 1 | -53/+69 |
* | | | Add remaining hook insertions | M. Dent | 2019-01-22 | 1 | -2/+9 |
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-21 | 1 | -1/+1 |
|\ \ \
| | |/
| |/| |
|
| * | | comment permission fix | zotlabs | 2019-01-20 | 1 | -1/+1 |
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-18 | 1 | -11/+13 |
|\| |
| |/
|/| |
|
| * | more specific network checking in several places and remove some old debuggin... | zotlabs | 2019-01-17 | 1 | -11/+13 |
* | | Merge branch 'dreport_fixes' into 'dev' | M. Dent | 2019-01-18 | 3 | -2/+8 |
|\ \
| |/
|/| |
|
| * | add space | Mario Vavti | 2019-01-17 | 1 | -1/+1 |
| * | fix delivery report for zot6 connections | Mario Vavti | 2019-01-17 | 3 | -2/+8 |
* | | channel connect issue | zotlabs | 2019-01-17 | 1 | -1/+1 |
|/ |
|
* | event attendance testing continued (now works at a basic level from one direc... | zotlabs | 2019-01-16 | 1 | -1/+1 |
* | more z6 event work | zotlabs | 2019-01-16 | 1 | -1/+27 |
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2019-01-16 | 13 | -141/+89 |
|\ |
|
| * | change logic for consistency | Mario Vavti | 2019-01-16 | 1 | -3/+6 |
| * | fix legacy zot dreport not passing the is_storable check | Mario Vavti | 2019-01-15 | 2 | -2/+16 |
| * | Remove stray $ | DM42.Net (Matt Dent) | 2019-01-13 | 1 | -1/+1 |
| * | Add privacygroup_extras_post/drop hooks | DM42.Net (Matt Dent) | 2019-01-13 | 1 | -1/+8 |
| * | Add pgrp_extras hook & display | DM42.Net (Matt Dent) | 2019-01-13 | 1 | -0/+5 |
| * | Use dba_driver.php::db_getfunc() | DM42.Net (Matt Dent) | 2019-01-11 | 1 | -10/+2 |
| * | Fix for PGSQL/MYSQL difference | DM42.Net (Matt Dent) | 2019-01-10 | 1 | -2/+11 |
| * | FIX: memory exhaustion on exceptionally large message queues & multiple Queue... | ZotSocial Admin | 2019-01-10 | 1 | -2/+10 |
| * | do not count removed channels | Mario Vavti | 2019-01-10 | 1 | -1/+1 |
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-09 | 1 | -1/+3 |
| |\ |
|
| * | | Remove Experimental Worker Queue from CORE - add hook 'daemon_master_release' | M. Dent | 2019-01-09 | 1 | -118/+11 |
| * | | Tweak to deal with changes that may happen within the same second. | DM42.Net (Matt Dent) | 2019-01-07 | 1 | -6/+11 |
| * | | fix preg_match(): Delimiter must not be alphanumeric or backslash warning | Mario Vavti | 2019-01-02 | 1 | -1/+1 |
| * | | Faster image processing with photo cache addon | Max Kostikov | 2018-12-24 | 1 | -5/+6 |
| * | | Merge branch 'fix_linkinfo_warning' into 'dev' | Mario | 2018-12-22 | 1 | -3/+3 |
| |\ \ |
|
| | * | | use count() instead of sizeof() | Mario Vavti | 2018-12-19 | 1 | -1/+1 |
| | * | | check if we deal with an array before sizeof() | Mario Vavti | 2018-12-19 | 1 | -3/+3 |
| * | | | do not add timestamp to the photo src. caching is handled in mod photo now. | Mario Vavti | 2018-12-21 | 1 | -1/+1 |
| * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-21 | 1 | -1/+1 |
| |\ \ \ |
|
| * | | | | missing observer check | Mario Vavti | 2018-12-20 | 1 | -0/+3 |
| * | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-20 | 1 | -2/+87 |
| |\ \ \ \ |
|
| * | | | | | make mod channel deal with b64 encoded mid\s | Mario Vavti | 2018-12-18 | 1 | -0/+8 |
| | |_|/ /
| |/| | | |
|
| * | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-18 | 4 | -12/+38 |
| |\ \ \ \ |
|
* | | | | | | more work on z6 events | zotlabs | 2019-01-16 | 1 | -0/+37 |
* | | | | | | more z6 compatibility fixes | zotlabs | 2019-01-16 | 3 | -2/+8 |
| |_|_|_|/
|/| | | | |
|
* | | | | | make Apps::get_base_apps() pluggable | zotlabs | 2019-01-08 | 1 | -1/+3 |
| |_|_|/
|/| | | |
|
* | | | | like permission issue | zotlabs | 2018-12-20 | 1 | -1/+1 |
| |_|/
|/| | |
|