aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-09-2680-423/+835
|\
| * Merge branch 'admindoc' into 'dev'M. Dent2019-09-243-9/+36
| |\ | | | | | | | | | | | | Improve admin documentation See merge request hubzilla/core!1737
| | * Improve admin documentationAle Abdo2019-09-243-9/+36
| |/
| * Merge branch 'dev' into 'dev'M. Dent2019-09-231-1/+1
| |\ | | | | | | | | | | | | Update plink type for MySQL schema See merge request hubzilla/core!1736
| | * 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/simplepie See merge request hubzilla/core!1735
| | * | composer update simplepie/simplepieMario Vavti2019-09-236-21/+55
| | | | | | | | | | | | (cherry picked from commit 9aa928ec8f378c6df2a0c8bbe892ff971c3bc672)
| * | | Merge branch 'cherry-pick-e4336578' into 'dev'M. Dent2019-09-237-25/+56
| |\ \ \ | | | | | | | | | | | | | | | | | | | | composer update vendor/league/html-to-markdown/.github/ See merge request hubzilla/core!1734
| | * | | composer update vendor/league/html-to-markdown/.github/Mario Vavti2019-09-237-25/+56
| | |/ / | | | | | | | | (cherry picked from commit e4336578388b3e59ba8130123649ccdc9b8487d0)
| * | | Merge branch 'cherry-pick-38cb094e' into 'dev'M. Dent2019-09-233-0/+130
| |\ \ \ | | | | | | | | | | | | | | | | | | | | composer update ezyang/htmlpurifier See merge request hubzilla/core!1733
| | * | | composer update ezyang/htmlpurifierMario Vavti2019-09-233-0/+130
| | |/ / | | | | | | | | (cherry picked from commit 38cb094ede8a389ef0b8bb331c1e6a3befd666a8)
| * | | Merge branch 'cherry-pick-a34ce790' into 'dev'M. Dent2019-09-2332-327/+318
| |\ \ \ | | | | | | | | | | | | | | | | | | | | composer update ezyang/htmlpurifier See merge request hubzilla/core!1732
| | * | | composer update ezyang/htmlpurifierMario Vavti2019-09-2332-327/+318
| | |/ / | | | | | | | | (cherry picked from commit a34ce790129bdd729a5019895ea6cd4c59f08ba4)
| * | | Merge branch 'cherry-pick-53b8ee78' into 'dev'M. Dent2019-09-237-23/+60
| |\ \ \ | | |/ / | |/| | | | | | | | | | composer update blueimp/jquery-file-upload See merge request hubzilla/core!1731
| | * | composer update blueimp/jquery-file-uploadMario Vavti2019-09-237-23/+60
| |/ / | | | | | | (cherry picked from commit 53b8ee7866eb1394980b08b90153a63563832391)
| * | Merge branch 'customitem-delivery' into 'dev'Mario2019-09-2310-30/+88
| |\ \ | | | | | | | | | | | | | | | | Notify on custom items - rework hooks See merge request hubzilla/core!1730
| | * | Notify on custom items - rework hooksM. Dent2019-09-2310-30/+88
| |/ /
| * | Merge branch 'encode-comment-policy' into 'dev'Mario2019-09-232-0/+63
| |\ \ | | | | | | | | | | | | | | | | Encode comment policy into AS(Z6) packets. See merge request hubzilla/core!1729
| | * | 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 #1331 See merge request hubzilla/core!1728
| | * | fix issue #1331Mario Vavti2019-09-191-1/+6
| |/ / | | | | | | (cherry picked from commit 394f263ddd648e25ff3967bfbe3b0e25dccf89a0)
| * | Merge branch 'dev' into 'dev'Mario2019-09-181-2/+9
| |\ \ | | | | | | | | | | | | | | | | change event formatting slightly for Zot6 and ActivityStreams. See merge request hubzilla/core!1727
| * \ \ Merge branch 'fix_homeinstall_for_Debian_10' into 'dev'Mario2019-09-182-78/+102
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Fix homeinstall for debian 10 See merge request hubzilla/core!1725
| | * | | 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 blurring See merge request hubzilla/core!1726
| | * | 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 reply See merge request hubzilla/core!1724
| | * | 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 processing See merge request hubzilla/core!1711
| | * | | 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" activity See merge request hubzilla/core!1723
| * \ \ \ \ Merge branch 'dev' into 'dev'Max Kostikov2019-09-031-0/+12
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | Add CalDAV / CardDAV autodiscovery See merge request hubzilla/core!1719
| | * | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | improved conversion of emoji reactions from zot to zot6 See merge request hubzilla/core!1720
| * \ \ \ \ \ Merge branch 'dev' into 'dev'Max Kostikov2019-09-036-7/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More nofollow tags to discourage backlink farmers See merge request hubzilla/core!1722
| | * | | | | | 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 Markdown See merge request hubzilla/core!1718
| | * | | | | 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... See merge request hubzilla/core!1717
* | | | | | | | issue with bearcap testszotlabs2019-09-261-0/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | change event formatting slightly for Zot6 and ActivityStreams.zotlabs2019-09-161-2/+9
| |_|_|_|/ / |/| | | | |
* | | | | | Zot -> Zot6 translation issue, liking a "new friend" activityzotlabs2019-09-032-8/+17
| |_|_|/ / |/| | | |
* | | | | 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
| |/ / / |/| | |
* | | | issues with image import to zot6 - wrong mid. Also label source project of ↵zotlabs2019-08-222-2/+2
|/ / / | | | | | | | | | zotfeed since it is not completely compatible across projects.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 19:19:05 +0000