lain
b770ed1d99
CommonAPI: Support emoji reactions.
5 years ago
lain
f017260cdc
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
lain
66519f2100
Merge branch 'list-controller' into 'develop'
...
Extract list actions from `MastodonAPIController` into `ListController`
See merge request pleroma/pleroma!1600
5 years ago
Maksim
ffcd742aa0
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
Maksim Pechnikov
00abe099cd
added tests for ActivityPub.like\unlike
5 years ago
lain
a0b21c8928
Transmogrifier: Handle incoming emoji reactions.
5 years ago
lain
6e1ec4c5da
ActivityPub: Basic EmojiReactions.
5 years ago
Egor Kislitsyn
4194abbc8f
Move mastodon_api/*_controller.ex to mastodon_api/controllers/
5 years ago
Egor Kislitsyn
30510ade0e
Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests
5 years ago
Egor Kislitsyn
4d82bc8b0b
Extract MastodonAPI.MastodonAPIController.errors/2 to MastodonAPI.FallbackController
5 years ago
Egor Kislitsyn
3b1b631c2a
Add validation in Pleroma.List.create/2
5 years ago
kaniini
6dc24422dc
Merge branch 'issue/1177' into 'develop'
...
[#1177 ] fixed unfollow for relay actor
See merge request pleroma/pleroma!1589
5 years ago
Maxim Filippov
37dd3867bb
Log admin/moderator actions
5 years ago
kaniini
503139b343
Merge branch 'fix-all-custom-fields-deleted' into 'develop'
...
Fix not to use unupdated attachments when all fields are deleted
See merge request pleroma/pleroma!1596
5 years ago
kPherox
3549cd9754
Change to use attachment only when fields do not exist
5 years ago
lain
90986667ce
Merge branch 'admin-create-users' into 'develop'
...
user creation admin api will create multiple users
See merge request pleroma/pleroma!1170
5 years ago
lain
efb8818e9e
Activity Expiration: Switch to 'expires_in' system.
5 years ago
lain
1692fa8945
ActivityExpirationWorker: Fix merge issues.
5 years ago
Maksim Pechnikov
654d291b6d
update tests
5 years ago
Maksim Pechnikov
6062017493
put_resp_header("content-type", "application/activity+json") -> put_resp_content_type("application/activity+json")
5 years ago
lain
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
5 years ago
Maksim Pechnikov
8dc6a6b210
fix /inbox for Relay
5 years ago
Maksim Pechnikov
399ca9133b
fix test
5 years ago
Maksim Pechnikov
f95b67c933
Merge branch 'develop' into issue/1177
5 years ago
Egor Kislitsyn
a79ebac592
Improve AP routes rate limit
5 years ago
Maksim Pechnikov
64bfb41c55
fixed unfollow for relay actor
5 years ago
Sachin Joshi
37229af15f
remove old user create and delete routes for admin
5 years ago
lain
f740d786a3
Merge branch 'rate-limit-ap-routes' into 'develop'
...
[#1174 ] Rate limit AP routes
See merge request pleroma/pleroma!1586
5 years ago
lain
74f7f308f8
Merge branch 'fix/admin-api-user-deletion' into 'develop'
...
Fix deactivated user deletion
See merge request pleroma/pleroma!1546
5 years ago
Egor Kislitsyn
8d899d6197
Add `:ap_routes` rate limit
5 years ago
lain
8340fe8fcc
Merge branch 'digest-template' into 'develop'
...
Improve digest email template
See merge request pleroma/pleroma!1565
5 years ago
lain
ef43016b2c
Merge branch 'feature/custom-fields' into 'develop'
...
Add custom profile fields
See merge request pleroma/pleroma!1488
5 years ago
Maxim Filippov
5171aa5b4d
Refactor check_actor_is_active
5 years ago
lain
d2c9befc64
Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Sergey Suprunenko
75a5dd41ee
Add more tests for Database tasks and DigestEmailWorker
5 years ago
lain
49ae3191df
Merge branch 'hotfix/user_unfollow' into 'develop'
...
[#1177 ] fixed User.unfollow with synchronization external user
See merge request pleroma/pleroma!1579
5 years ago
Maksim Pechnikov
e652cef76b
removes duplicates from relay subscription list
5 years ago
kaniini
475fcb3e6c
Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop'
...
Clear follow requests when blocking a user
See merge request pleroma/pleroma!1583
5 years ago
kaniini
18c8c8d176
Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'
...
Hide muted theads from home/public timelines unless `with_muted` is set
See merge request pleroma/pleroma!1575
5 years ago
Sadposter
94e336d9d5
clear follow requests when blocking a user
5 years ago
Mark Felder
ef82f868d9
Formatting
5 years ago
Maksim Pechnikov
3315a2a1c3
fixed User.unfollow with synchronization external user
5 years ago
lain
7ab2dbbdb6
Merge branch 'pleroma-conversations' into 'develop'
...
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
5 years ago
Egor Kislitsyn
158231cd20
Add configurable colors and logo for the digest template
5 years ago
Mark Felder
6a3b1a526e
max_body_size -> max_body_length, as it should be
5 years ago
rinpatch
fba3c16d20
Fix OAuth cleanup worker unconditionally starting
...
!1576 removed enabled/disabled check from the worker, in favor of just
not starting it in application.ex if disabled. However a line
unconditionally starting the worker was removed
5 years ago
kaniini
1c8f58a30e
Merge branch 'features/formatting-sub_sup' into 'develop'
...
html.ex: Allow sub and sup elements by default
Closes #1191
See merge request pleroma/pleroma!1572
5 years ago
rinpatch
1ad71592ad
Parallelize template rendering
5 years ago
rinpatch
a4a3e3becd
Hide muted theads from home/public timelines unless `with_muted` is set
5 years ago
lain
9fb71ce7f4
Merge branch 'cache-follow-state' into 'develop'
...
Cache follow state
Closes #1180
See merge request pleroma/pleroma!1573
5 years ago