aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* missing use appMario Vavti2019-02-141-0/+1
|
* Merge branch 'affinity_fixes' into 'dev'M. Dent2019-02-143-111/+93
|\ | | | | | | | | affinity tool fixes See merge request hubzilla/core!1511
| * affinity tool fixesMario Vavti2019-02-143-111/+93
| |
* | disable repeats until issues are resolvedMario Vavti2019-02-141-1/+2
|/
* affinity slider as appphani002019-02-145-8/+85
|
* Only cascade privacy warning if thread parent has privacy concerns.M.Dent2019-02-131-5/+2
|
* Fix: only first lock red with privacy_warningM.Dent2019-02-121-3/+9
|
* Get all listenersM.Dent2019-02-111-2/+2
|
* use ACTIVITY_SHARE to match the verbMario Vavti2019-02-081-1/+1
|
* missing use AppMario Vavti2019-02-081-0/+1
|
* Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2019-02-073-7/+23
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2019-02-075-56/+112
| |\
| * \ Merge remote-tracking branch 'mike/master' into devMario Vavti2019-02-061-12/+28
| |\ \
| * \ \ Merge branch 'viewsrc_update' into 'dev'Max Kostikov2019-02-041-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | add the actual mid for debuging reasons See merge request hubzilla/core!1506
| | * | | add the actual mid for debuging reasonsMario Vavti2019-02-031-2/+2
| | | | |
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-02-047-24/+27
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | cleanup logging and return if query returns empty resultMario Vavti2019-02-031-3/+6
| | | | |
| * | | | do not overwrite $sql_extraMario Vavti2019-02-031-2/+4
| | | | |
| * | | | Set lock red and provide warning if a forum is tagged in the postM. Dent2019-02-011-0/+11
| | | | |
| * | | | starring and filing is only supported for post item typeMario2019-01-311-2/+2
| | | | |
* | | | | disable repeat unless mid is a resolvable uri since this will do radically ↵zotlabs2019-02-072-6/+5
| | | | | | | | | | | | | | | | | | | | different things on different network stacks (e.g. Diaspora) and it turns out there is no possible way to make Diaspora reshares compatible with ActivityPub or Zot6 repeat/announce/boost/whatever.
* | | | | automatically redirect repeat to share for posts with unresolvable ↵zotlabs2019-02-071-3/+9
| | | | | | | | | | | | | | | | | | | | message-ids (diaspora, hz < 4.0, etc.).
* | | | | add missing zot6 conversation completion (required for message repeats)zotlabs2019-02-072-0/+197
| | | | |
* | | | | fix mid generation for shareszotlabs2019-02-071-2/+2
| |_|_|/ |/| | |
* | | | fix verb for reshareszotlabs2019-02-061-1/+1
| | | |
* | | | more work on share/repeatzotlabs2019-02-061-1/+2
| | | |
* | | | work on repeat/share for Hubzillazotlabs2019-02-064-55/+110
| |_|/ |/| |
* | | 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
| | |/ / | |/| |