aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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
|\ \ | | | | | | | | | | | | 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
| * | | Zot -> Zot6 translation issue, liking a "new friend" activityzotlabs2019-09-032-8/+17
| | | |
* | | | 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
| * | | 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 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
| * | | 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.
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-08-222-2/+2
|\ \ \ | | | | | | | | | | | | | | | | possible for DB to return hublocs with no sitekey See merge request hubzilla/core!1713
| * \ \ Merge branch 'dev' of https://framagit.org/zot/core into devzotlabs2019-08-2112-553/+591
| |\ \ \
| * | | | possible for DB to return hublocs with no sitekeyzotlabs2019-08-212-2/+2
| | | | |
* | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-08-221-2/+2
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | Fix attach permissions sync for clonned channel See merge request hubzilla/core!1716
| * | | | Fix attach permissions sync for clonned channelMax Kostikov2019-08-221-2/+2
| | | | |
* | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-08-221-0/+3
|\| | | | | |_|_|/ |/| | | | | | | | | | | Fix spoiler displaying while convert BBcode to markdown See merge request hubzilla/core!1715
| * | | Fix spoiler displaying while convert BBcode to markdownMax Kostikov2019-08-221-0/+3
|/ / /
* | | update changelogMario Vavti2019-08-161-0/+6
| | |
* | | Merge branch 'dev' into 'dev'Mario2019-08-1612-553/+591
|\ \ \ | |/ / |/| / | |/ | | zot6 compatibility: when posting from a non-primary clone the actor->id is... See merge request hubzilla/core!1710
| * support "bearcaps" in Activity libraryzotlabs2019-08-151-0/+19
| |
| * show correct profile photo when previewing and editing profileszotlabs2019-08-151-1/+9
| |
| * fix bitrot in util/zotshzotlabs2019-08-1510-551/+546
| |
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-08-150-0/+0
| |\ | |/ |/|
* | Merge branch 'dev' into 'dev'Max Kostikov2019-08-141-1/+1
|\ \ | | | | | | | | | | | | illegal offset warning (prevents encrypted signatures from being used for... See merge request hubzilla/core!1709
| | * zot6 compatibility: when posting from a non-primary clone the actor->id is ↵zotlabs2019-08-141-1/+17
| |/ | | | | | | that of the primary, resulting in an author/owner identity mismatch. Solution is to always post with the actor->id set to the sender if it is a local channel.
| * illegal offset warning (prevents encrypted signatures from being used for ↵zotlabs2019-08-131-1/+1
|/ | | | encrypted messages). Not fatal but can leak metadata.
* update changelogMario Vavti2019-08-131-1/+3
|