aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'admindoc' into 'dev'M. Dent2019-09-243-9/+36
|\
| * Improve admin documentationAle Abdo2019-09-243-9/+36
|/
* Merge branch 'dev' into 'dev'M. Dent2019-09-231-1/+1
|\
| * Update schema_mysql.sqlMax Kostikov2019-09-231-1/+1
| * Update plink type for MySQLMax Kostikov2019-09-231-1/+1
* | Merge branch 'cherry-pick-9aa928ec' into 'dev'M. Dent2019-09-236-21/+55
|\ \
| * | composer update simplepie/simplepieMario Vavti2019-09-236-21/+55
* | | Merge branch 'cherry-pick-e4336578' into 'dev'M. Dent2019-09-237-25/+56
|\ \ \
| * | | composer update vendor/league/html-to-markdown/.github/Mario Vavti2019-09-237-25/+56
| |/ /
* | | Merge branch 'cherry-pick-38cb094e' into 'dev'M. Dent2019-09-233-0/+130
|\ \ \
| * | | composer update ezyang/htmlpurifierMario Vavti2019-09-233-0/+130
| |/ /
* | | Merge branch 'cherry-pick-a34ce790' into 'dev'M. Dent2019-09-2332-327/+318
|\ \ \
| * | | composer update ezyang/htmlpurifierMario Vavti2019-09-2332-327/+318
| |/ /
* | | Merge branch 'cherry-pick-53b8ee78' into 'dev'M. Dent2019-09-237-23/+60
|\ \ \ | |/ / |/| |
| * | composer update blueimp/jquery-file-uploadMario Vavti2019-09-237-23/+60
|/ /
* | Merge branch 'customitem-delivery' into 'dev'Mario2019-09-2310-30/+88
|\ \
| * | Notify on custom items - rework hooksM. Dent2019-09-2310-30/+88
|/ /
* | Merge branch 'encode-comment-policy' into 'dev'Mario2019-09-232-0/+63
|\ \
| * | Add dependencyDM42.Net Zap Dev2019-09-211-0/+1
| * | comment policy default for ordered itemsDM42.Net Zap Dev2019-09-211-0/+21
| * | encode/decode comment_policy for Z6DM42.Net Zap Dev2019-09-212-0/+41
|/ /
* | Merge branch 'cherry-pick-394f263d' into 'dev'Max Kostikov2019-09-191-1/+6
|\ \
| * | fix issue #1331Mario Vavti2019-09-191-1/+6
|/ /
* | Merge branch 'dev' into 'dev'Mario2019-09-181-2/+9
|\ \
| * | change event formatting slightly for Zot6 and ActivityStreams.zotlabs2019-09-161-2/+9
* | | Merge branch 'fix_homeinstall_for_Debian_10' into 'dev'Mario2019-09-182-78/+102
|\ \ \
| * | | hominstall - readmeOJ Random2019-09-141-2/+2
| * | | hominstall - fix url rewriting and minor changes.OJ Random2019-09-142-77/+101
* | | | Merge branch 'dev' into 'dev'Max Kostikov2019-09-151-1/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Prevent image blurringMax Kostikov2019-09-151-1/+1
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-09-101-2/+2
|\| |
| * | Add selected text quote on comment replyMax Kostikov2019-09-091-2/+2
* | | Merge branch 'daemon-qwfix' into 'dev'Max Kostikov2019-09-104-6/+6
|\ \ \
| * | | Return in the case of further processingDM42.Net Zap Dev2019-08-194-6/+6
* | | | Merge branch 'dev' into 'dev'Max Kostikov2019-09-102-8/+17
|\ \ \ \ | | |_|/ | |/| |
| * | | Zot -> Zot6 translation issue, liking a "new friend" activityzotlabs2019-09-032-8/+17
* | | | Merge branch 'dev' into 'dev'Max Kostikov2019-09-031-0/+12
|\ \ \ \ | | |_|/ | |/| |
| * | | Update Well_known.phpMax Kostikov2019-08-301-1/+1
| * | | Add CalDAV / CardDAV autodiscoveryMax Kostikov2019-08-301-0/+12
* | | | Merge branch 'dev' into 'dev'Max Kostikov2019-09-032-0/+24
|\ \ \ \ | | |/ / | |/| |
| * | | Clarify private mail deletion policy. Related to issue #1391.zotlabs2019-08-311-0/+5
| * | | improved conversion of emoji reactions from zot to zot6zotlabs2019-08-311-0/+19
* | | | Merge branch 'dev' into 'dev'Max Kostikov2019-09-036-7/+7
|\ \ \ \
| * | | | More nofollow tags to discourage backlink farmersTerrox2019-09-036-7/+7
|/ / / /
* | | | Merge branch 'dev' into 'dev'Max Kostikov2019-08-241-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Better spoiler BBcode tag conversion to MarkdownMax Kostikov2019-08-231-1/+1
* | | | Merge branch 'dev' into 'dev'Max Kostikov2019-08-232-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | issues with image import to zot6 - wrong mid. Also label source project of zo...zotlabs2019-08-222-2/+2
|/ / /
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-08-222-2/+2
|\ \ \
| * \ \ Merge branch 'dev' of https://framagit.org/zot/core into devzotlabs2019-08-2112-553/+591
| |\ \ \