aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Remove visible channels list from pubstream tags cloud creation proce...Max Kostikov2019-10-133-18/+86
* Merge branch 'cherry-pick-cac0672a' into 'dev'M. Dent2019-10-081-3/+7
|\
| * issue #1401Mario Vavti2019-10-081-3/+7
|/
* Merge branch 'cherry-pick-d8b8d8ce' into 'dev'Max Kostikov2019-10-061-1/+2
|\
| * fix zap->hubzlla event title compatibilityMario Vavti2019-10-051-1/+2
|/
* Merge branch 'dev' into 'dev'Mario2019-10-052-7/+4
|\
| * Allow addons to process forum posts published through mentionsMax Kostikov2019-10-052-7/+4
|/
* Merge branch 'cherry-pick-79bcc157' into 'dev'Mario2019-10-052-0/+7
|\
| * fix bbcode event reshare timezone issueMario Vavti2019-10-042-0/+7
* | Merge branch 'dev' into 'dev'Mario2019-10-051-2/+7
|\ \ | |/ |/|
| * another timezone fixZot2019-10-051-2/+7
|/
* Merge branch 'cherry-pick-2c7ed093' into 'dev'Max Kostikov2019-10-021-3/+2
|\
| * fix missing summary in mod article_editMario Vavti2019-10-021-3/+2
|/
* Merge branch 'dev' into 'dev'Mario2019-10-014-13941/+14039
|\
| * Add 'Connect' button for not connected at this location channelsMax Kostikov2019-10-014-13941/+14039
|/
* Merge branch 'dev' into 'dev'Max Kostikov2019-09-301-8/+10
|\
| * Fix empty string quotation; remove trailing spaces Max Kostikov2019-09-301-8/+10
|/
* Merge branch 'dev' into 'dev'Mario2019-09-302-8/+19
|\
| * Sync private items with clones; avoid sync if no local connection with thread...Max Kostikov2019-09-302-8/+19
|/
* Merge branch 'dev' into 'dev'Mario2019-09-281-0/+1
|\
| * issue with bearcap testszotlabs2019-09-261-0/+1
* | 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
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-20 14:33:11 +0000