aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2019-02-075-56/+112
|\
| * 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
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-02-061-12/+28
|\|
| * allow conversation completion for new comments to expired posts, regardless o...zotlabs2019-02-051-12/+28
* | Merge branch 'viewsrc_update' into 'dev'Max Kostikov2019-02-041-2/+2
|\ \
| * | 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
|\ \ \ | |/ / |/| / | |/
| * fix linkify_tags() so it works with xchans across multiple protocols, also so...zotlabs2019-02-037-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
|/
* 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 requestedMark Nowiasz2019-01-291-15/+35
* | | Revert "Make session handler pluggable"Mario2019-01-291-20/+9
* | | Revert "fix wrong function name and coding style"Mario2019-01-291-1/+1
* | | 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 pluggableDM42.Net (Matt Dent)2019-01-281-9/+20
* | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 16:53:26 +0000