aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* allow conversation completion for new comments to expired posts, regardless ↵zotlabs2019-02-051-12/+28
| | | | | | of hyperdrive settings. Note that hyperdrive conversations may still be fetched from zap/osada servers but will be ignored.
* fix linkify_tags() so it works with xchans across multiple protocols, also ↵zotlabs2019-02-037-24/+27
| | | | some fixes to activity parsing from upstream.
* Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-301-0/+27
|\
| * cache embeds in the background on initial storage rather than on first accesszotlabs2019-01-291-0/+27
| |
* | clean up whitespace and remove superfluous semicolonMario Vavti2019-01-291-18/+20
| |
* | Merge branch 'dev' into 'dev'Mario2019-01-291-15/+35
|\ \ | | | | | | | | | | | | Custom sessionhandler support, as requested See merge request hubzilla/core!1497
| * | Custom sessionhandler support, as requestedMark Nowiasz2019-01-291-15/+35
| | |
* | | Revert "Make session handler pluggable"Mario2019-01-291-20/+9
| | | | | | | | | This reverts commit 8972ca8134c16039c03ad83d26b75b9e9e21d7ea
* | | Revert "fix wrong function name and coding style"Mario2019-01-291-1/+1
| | | | | | | | | This reverts commit 456207b4e75ee4b28b60e90b44ef758dc95b2ebc
* | | fix wrong function name and coding styleMario Vavti2019-01-291-1/+1
| | |
* | | Merge branch 'sessionhandlerhook' into 'dev'Mario2019-01-291-9/+20
|\ \ \ | | | | | | | | | | | | | | | | Make session handler pluggable See merge request hubzilla/core!1494
| * | | Make session handler pluggableDM42.Net (Matt Dent)2019-01-281-9/+20
| | | |
* | | | Merge branch 'doku' into 'dev'Mario2019-01-292-146/+249
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Extend documentation. See merge request hubzilla/core!1496
| * | | 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. See merge request hubzilla/core!1485
| | * | Correct and extend Doxygen comments.Klaus Weidenbach2019-01-234-143/+146
| | | | | | | | | | | | | | | | | | | | | | | | Correct some documentation errors for Doxygen and add more comments. Document some undefined variables with @FIXME.
| * | | 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. See merge request hubzilla/core!1481
| | * | | Try to fix some warnings in Zotlabs\Module\Embedphotos.Klaus Weidenbach2019-01-221-53/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $phototypes was undefined, hope this is correct selection to fix it. Correct Doxygen and clean up some variables and refactoring.
| * | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix delivery report for zot6 connections See merge request hubzilla/core!1476
| | * | | | | 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 ↵zotlabs2019-01-171-11/+13
|/ / | | | | | | debugging crud
* / channel connect issuezotlabs2019-01-171-1/+1
|/
* event attendance testing continued (now works at a basic level from one ↵zotlabs2019-01-161-1/+1
| | | | direction, more testing needed)
* 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 ↵ZotSocial Admin2019-01-101-2/+10
| | | | | | | | Queue.php invocations duplicate work
| * do not count removed channelsMario Vavti2019-01-101-1/+1
| |
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-091-1/+3
| |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 03:52:59 +0000