984d7be1a4
Merge branch 'feature/remove-disable-blocks' into 'develop'
...
config: remove legacy activitypub accept_blocks setting
See merge request pleroma/pleroma!1556
5 years ago
f46cd7e9c7
config: remove legacy activitypub accept_blocks setting
...
Anyone who is interested in dropping blocks can write their own MRF
policy at this point. This setting predated the MRF framework.
Disabling the side effect (unsubscription) is still a config option
per policy.
5 years ago
b0fad153e1
Merge branch 'update/admin-fe' into 'develop'
...
Update AdminFE
See merge request pleroma/pleroma!1555
5 years ago
24a731a9a6
Update AdminFE
...
Now permits server configuration. Consider this ALPHA.
5 years ago
2674db14a2
Modify Changelog.
5 years ago
511ccea5aa
ConversationView: Align parameter names with other views.
5 years ago
60231ec7bd
Conversation: Add endpoint to get a conversation by id.
5 years ago
23c46f7e72
Conversations: Use 'recipients' for accounts in conversation view.
...
According to gargron, this is the intended usage.
5 years ago
b9578bb8a0
Merge branch 'chore/changelog-update' into 'develop'
...
Add a changelog entry for !1552
See merge request pleroma/pleroma!1553
5 years ago
d4d31ffdc4
Add a changelog entry for !1552
5 years ago
9a8a01837e
Merge branch 'fix/fix-type-depth' into 'develop'
...
Do not fetch the reply object in `fix_type` unless the object has the `name` key and use a depth limit when fetching it
See merge request pleroma/pleroma!1552
5 years ago
92479c6f48
Do not fetch the reply object in `fix_type` unless the object has the
...
`name` key and use a depth limit when fetching it
5 years ago
779e32a879
Merge branch 'fix/mrf-subdomain-case-insensitive' into 'develop'
...
MRF: ensure that subdomain_match calls are case-insensitive
See merge request pleroma/pleroma!1550
5 years ago
9cfc289594
MRF: ensure that subdomain_match calls are case-insensitive
5 years ago
17d5564a9c
Merge branch 'fix/hide-follows-counters' into 'develop'
...
Mastodon API: Set follower/following counters to 0 when hiding followers/following is enabled
See merge request pleroma/pleroma!1544
5 years ago
84808e1697
Merge branch 'develop' into 'fix/hide-follows-counters'
...
# Conflicts:
# CHANGELOG.md
5 years ago
708e7f0942
Merge branch 'fix/crash-favourited-by-ordered-collections' into 'develop'
...
Strip internal fields including likes from incoming and outgoing activities
Closes #1159
See merge request pleroma/pleroma!1533
5 years ago
af4cf35e20
Strip internal fields including likes from incoming and outgoing activities
5 years ago
5aa62b8581
Merge branch 'test/pleroma_uploaders' into 'develop'
...
tests for Pleroma.Uploaders
See merge request pleroma/pleroma!1543
5 years ago
11d08c2de0
tests for Pleroma.Uploaders
5 years ago
390329a303
Merge branch 'fix/mastoapi-threadmute-detection' into 'develop'
...
Mastodon API: Fix thread mute detection
See merge request pleroma/pleroma!1548
5 years ago
0802a08871
Mastodon API: Fix thread mute detection
...
It was calling CommonAPI.thread_muted? with post author's account
instead of viewer's one.
5 years ago
337edb3e50
Merge branch 'feature/uploader_s3' into 'develop'
...
Uploader.S3 added support stream uploads
See merge request pleroma/pleroma!1545
5 years ago
bb9c539580
Uploader.S3 added support stream uploads
5 years ago
dfae61c25c
Fix deactivated user deletion
5 years ago
409bcad54b
Mastodon API: Set follower/following counters to 0 when hiding
...
followers/following is enabled
We are already doing that in AP representation, so I think we should do
it here as well for consistency.
5 years ago
29807ef6a5
Merge branch 'feature/digest-email' into 'develop'
...
Feature/digest email
See merge request pleroma/pleroma!1078
5 years ago
a2b98f6d58
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
b18234e04c
Merge branch 'patch-3' into 'develop'
...
Return profile URL when available instead of actor URI for MastodonAPI mention URL
Closes #1165
See merge request pleroma/pleroma!1541
5 years ago
9c0da1009a
Return profile URL in MastodonAPI's `url` field
5 years ago
089d53a961
Simplify logic to mention.js `url` field
...
`User.profile_url` already fallbacks to ap_id
5 years ago
a10c840aba
Return profile URL when available instead of actor URI for MastodonAPI mention URL
...
Fixes #1165
5 years ago
aa718ab8f6
Merge branch 'fix/object-reembeds' into 'develop'
...
Do not rembed the object after updating it
Closes #1142
See merge request pleroma/pleroma!1538
5 years ago
4f1b9c54b9
Do not rembed the object after updating it
5 years ago
5329e84d62
OStatus tests: stop relying on embedded objects
5 years ago
32018a4ee0
ActivityPub tests: remove assertions of embedded object being updated,
...
because the objects are no longer supposed to be embedded
5 years ago
03ad31328c
OStatus Announce Representer: Do not depend on the object being embedded
...
in the Create activity
5 years ago
73d8d5c49f
Stop depending on the embedded object in restrict_favorited_by
5 years ago
dea3bd02ce
Merge branch 'issue/1150' into 'develop'
...
[#1150 ] fixed parser TwitterCard
See merge request pleroma/pleroma!1537
5 years ago
139b196bc0
[ #1150 ] fixed parser TwitterCard
5 years ago
e4a01d253e
Conversation: Rename function to better express what it does.
5 years ago
a49c92f6ae
Participation: Setting recipients will always add the owner.
5 years ago
486b474327
Merge branch 'test/common_api_utils.ex' into 'develop'
...
tests for CommonApi/Utils
See merge request pleroma/pleroma!1534
5 years ago
bdc9a7222c
tests for CommonApi/Utils
5 years ago
d6fe220e32
Linting.
5 years ago
ddabe7784b
Pleroma Conversations: Document differences.
5 years ago
b64b6fee2a
CommonAPI: Replies to conversations also get the correct context id.
5 years ago
3af6d14da7
Pleroma Conversations API: Add a way to set recipients.
5 years ago
bbd9ed0257
Update CHANGELOG
5 years ago
fd60fd4713
Merge branch 'report-email-from-remote-user' into 'develop'
...
Remove Reply-To from report emails
Closes #1141
See merge request pleroma/pleroma!1531
5 years ago
kaniini