limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity
6614 commits 27 branches 107 tags 315 MiB
Commit graph

6614 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ivan Tashkinov
0e1c481a94 [#1149] Added more oban workers. Refactoring. 2019-08-13 20:20:26 +03:00
kaniini
984d7be1a4 Merge branch 'feature/remove-disable-blocks' into 'develop' 
config: remove legacy activitypub accept_blocks setting

See merge request pleroma/pleroma!1556
 2019-08-13 02:45:47 +00:00
Ariadne Conill
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.
 2019-08-13 02:15:21 +00:00
rinpatch
b0fad153e1 Merge branch 'update/admin-fe' into 'develop' 
Update AdminFE

See merge request pleroma/pleroma!1555
 2019-08-12 21:07:11 +00:00
Mark Felder
24a731a9a6 Update AdminFE 
Now permits server configuration. Consider this ALPHA.
 2019-08-12 15:00:03 -05:00
lain
2674db14a2 Modify Changelog. 2019-08-12 14:31:12 +02:00
lain
511ccea5aa ConversationView: Align parameter names with other views. 2019-08-12 14:23:06 +02:00
lain
60231ec7bd Conversation: Add endpoint to get a conversation by id. 2019-08-12 13:58:04 +02:00
lain
23c46f7e72 Conversations: Use 'recipients' for accounts in conversation view. 
According to gargron, this is the intended usage.
 2019-08-12 12:51:08 +02:00
rinpatch
b9578bb8a0 Merge branch 'chore/changelog-update' into 'develop' 
Add a changelog entry for !1552

See merge request pleroma/pleroma!1553
 2019-08-11 20:25:17 +00:00
rinpatch
d4d31ffdc4 Add a changelog entry for !1552 2019-08-11 23:19:20 +03:00
rinpatch
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
 2019-08-11 20:01:10 +00:00
rinpatch
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
 2019-08-11 22:49:55 +03:00
kaniini
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
 2019-08-10 21:33:19 +00:00
Ariadne Conill
9cfc289594 MRF: ensure that subdomain_match calls are case-insensitive 2019-08-10 21:19:26 +00:00
kaniini
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
 2019-08-10 18:59:24 +00:00
kaniini
84808e1697 Merge branch 'develop' into 'fix/hide-follows-counters' 
# Conflicts:
#   CHANGELOG.md
 2019-08-10 18:49:04 +00:00
kaniini
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
 2019-08-10 18:47:40 +00:00
Sergey Suprunenko
af4cf35e20 Strip internal fields including likes from incoming and outgoing activities 2019-08-10 18:47:40 +00:00
kaniini
5aa62b8581 Merge branch 'test/pleroma_uploaders' into 'develop' 
tests for Pleroma.Uploaders

See merge request pleroma/pleroma!1543
 2019-08-10 18:46:26 +00:00
Maksim
11d08c2de0 tests for Pleroma.Uploaders 2019-08-10 18:46:26 +00:00
kaniini
390329a303 Merge branch 'fix/mastoapi-threadmute-detection' into 'develop' 
Mastodon API: Fix thread mute detection

See merge request pleroma/pleroma!1548
 2019-08-10 18:29:16 +00:00
Ivan Tashkinov
33a5fc4a70 [#1149] Fixed failing tests. Ensured Instance.set_unreachable/2 supports ISO 8601 datetime. 2019-08-10 20:38:31 +03:00
rinpatch
0802a08871 Mastodon API: Fix thread mute detection 
It was calling CommonAPI.thread_muted? with post author's account
instead of viewer's one.
 2019-08-10 16:27:46 +03:00
rinpatch
337edb3e50 Merge branch 'feature/uploader_s3' into 'develop' 
Uploader.S3 added support stream uploads

See merge request pleroma/pleroma!1545
 2019-08-10 11:28:00 +00:00
Maksim
bb9c539580 Uploader.S3 added support stream uploads 2019-08-10 11:27:59 +00:00
Maxim Filippov
dfae61c25c Fix deactivated user deletion 2019-08-09 23:05:28 +03:00
Ivan Tashkinov
267262491e Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 2019-08-09 20:09:56 +03:00
Ivan Tashkinov
b7fad8d395 [#1149] Oban jobs implementation for :federator_incoming and :federator_outgoing queues. 2019-08-09 20:08:01 +03:00
rinpatch
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.
 2019-08-09 16:53:55 +03:00
lain
29807ef6a5 Merge branch 'feature/digest-email' into 'develop' 
Feature/digest email

See merge request pleroma/pleroma!1078
 2019-08-08 14:38:33 +00:00
lain
a2b98f6d58 Merge remote-tracking branch 'origin/develop' into pleroma-conversations 2019-08-08 16:04:20 +02:00
rinpatch
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
 2019-08-07 22:14:02 +00:00
Thibaut Girka
9c0da1009a Return profile URL in MastodonAPI's url field 2019-08-07 21:40:53 +00:00
Thibaut Girka
089d53a961 Simplify logic to mention.js url field 
`User.profile_url` already fallbacks to ap_id
 2019-08-07 20:55:37 +00:00
Thibaut Girka
a10c840aba Return profile URL when available instead of actor URI for MastodonAPI mention URL 
Fixes #1165
 2019-08-07 20:29:30 +00:00
Haelwenn
aa718ab8f6 Merge branch 'fix/object-reembeds' into 'develop' 
Do not rembed the object after updating it

Closes #1142

See merge request pleroma/pleroma!1538
 2019-08-06 22:14:00 +00:00
rinpatch
4f1b9c54b9 Do not rembed the object after updating it 2019-08-07 01:02:29 +03:00
rinpatch
5329e84d62 OStatus tests: stop relying on embedded objects 2019-08-07 00:58:48 +03:00
rinpatch
32018a4ee0 ActivityPub tests: remove assertions of embedded object being updated, 
because the objects are no longer supposed to be embedded
 2019-08-07 00:36:13 +03:00
rinpatch
03ad31328c OStatus Announce Representer: Do not depend on the object being embedded 
in the Create activity
 2019-08-07 00:23:58 +03:00
rinpatch
73d8d5c49f Stop depending on the embedded object in restrict_favorited_by 2019-08-07 00:12:42 +03:00
kaniini
dea3bd02ce Merge branch 'issue/1150' into 'develop' 
[#1150] fixed parser TwitterCard

See merge request pleroma/pleroma!1537
 2019-08-06 20:19:28 +00:00
Maksim
139b196bc0 [#1150] fixed parser TwitterCard 2019-08-06 20:19:28 +00:00
lain
e4a01d253e Conversation: Rename function to better express what it does. 2019-08-06 15:06:19 +02:00
lain
a49c92f6ae Participation: Setting recipients will always add the owner. 2019-08-06 14:51:17 +02:00
kaniini
486b474327 Merge branch 'test/common_api_utils.ex' into 'develop' 
tests for CommonApi/Utils

See merge request pleroma/pleroma!1534
 2019-08-05 15:37:05 +00:00
Maksim
bdc9a7222c tests for CommonApi/Utils 2019-08-05 15:37:05 +00:00
lain
d6fe220e32 Linting. 2019-08-05 16:11:23 +02:00
lain
ddabe7784b Pleroma Conversations: Document differences. 2019-08-05 15:58:14 +02:00