e8b340aaa7
Docs: fix various Pleroma API endpoints paths, fix MFA response
2022-01-07 12:51:54 -06:00
a3094b64df
Merge branch 'change/web-push-encryption-dep' into 'develop'
...
Upgrade web_push_encryption to 0.3.1
See merge request pleroma/pleroma!3592
2022-01-02 15:41:56 +00:00
bf995a7770
Upgrade web_push_encryption to 0.3.1
2022-01-01 21:02:09 -07:00
c8026fe492
Merge branch 'change/concurrent-limiter-dep' into 'develop'
...
Change concurrent_limiter to version 0.1.1
See merge request pleroma/pleroma!3591
2022-01-01 22:15:08 +00:00
91ea394cd0
Change concurrent_limiter to Hex PM version 0.1.1
2022-01-01 14:49:57 -07:00
86e692aeb1
Merge branch 'erratic-streamer-test' into 'develop'
...
StreamerTest: tag erratic test
See merge request pleroma/pleroma!3590
2021-12-31 16:40:14 +00:00
2ae867842b
StreamerTest: tag erratic test
2021-12-31 10:29:50 -06:00
dafcf896d9
Merge more stuff from upstream develop branch
2021-12-30 14:25:45 -07:00
e25af3f2d8
Merge branch 'more-efficient-ci' into 'develop'
...
CI: Use own package as base
See merge request pleroma/pleroma!3577
2021-12-30 15:53:33 +00:00
ffeae7ef2c
Fix merge conflict in CHANGELOG.md
2021-12-29 18:08:50 -07:00
84420d9439
Merge branch 'chore/user-relationships-target-id-rel-type-index' into 'develop'
...
Added index on [:target_id, :relationship_type] to :user_relationships
See merge request pleroma/pleroma!3588
2021-12-29 13:06:47 +00:00
a7bdefc208
`mix format`
2021-12-29 11:44:33 +03:00
0c7fb520bf
Added index on [:target_id, :relationship_type] to :user_relationships (speeds up `Notification.exclude_blockers/_`).
2021-12-29 11:41:21 +03:00
a61ed5c488
Merge branch 'changelog' into 'develop'
...
Update CHANGELOG.md
See merge request pleroma/pleroma!3586
2021-12-28 21:42:39 +00:00
5f87472cdf
Update CHANGELOG.md
2021-12-28 15:14:09 -06:00
b5b98f9e10
Merge branch 'mastodon-lookup' into 'develop'
...
MastoAPI: Add `GET /api/v1/accounts/lookup`
See merge request pleroma/pleroma!3584
2021-12-28 21:00:09 +00:00
1657db656c
AccountController.lookup: skip auth
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-28 20:02:59 +01:00
0dd1caa841
AccountController.lookup: skip visibility check
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-28 18:24:48 +01:00
9032d065e6
wip
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-28 18:07:19 +01:00
746c9daa62
Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-28 16:27:27 +01:00
f734579965
MastoAPI: Add `GET /api/v1/accounts/lookup`
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-28 16:11:17 +01:00
de7f84deb3
Merge branch 'apps-api-endpoint' into 'develop'
...
Apps API endpoint
See merge request pleroma/pleroma!3583
2021-12-28 14:38:02 +00:00
9a27cb4f9d
Deal with target not found error in add_alias
...
Ref: emit-move
2021-12-28 01:11:08 -05:00
3fd13b70ec
Test that the target account is re-fetched in move_account
...
Ref: emit-move
2021-12-28 01:11:08 -05:00
eb383ef8d3
Make move_account endpoint process non-existent users properly
...
Ref: emit-move
2021-12-28 01:11:08 -05:00
a677c621e8
Make move_following worker follow then unfollow
...
Ref: emit-move
2021-12-28 01:11:08 -05:00
4f44fd32ea
Federate unfollow activity in move_following properly
...
0: Use the CommonAPI unfollow function to make sure the
unfollow activity is federated.
1: Limit the follow and unfollow to local followers only,
while let the romote servers decide whether to move their followers.
Ref: emit-move
2021-12-28 01:11:08 -05:00
e41eee5ed1
Make Move activity federate properly
...
Ref: emit-move
2021-12-28 01:11:08 -05:00
1d8abf2511
Document aliases endpoints
...
Ref: emit-move
2021-12-28 01:11:08 -05:00
54d7b4354c
Add deleting alias endpoint
...
Ref: emit-move
2021-12-28 01:11:08 -05:00
c1aa3c98ac
Add get and add aliases endpoints
...
Ref: emit-move
2021-12-28 01:11:08 -05:00
60081a8818
Add User.add_alias/2 and User.alias_users/1
...
Ref: emit-move
2021-12-28 01:11:07 -05:00
3092558bc1
Add changelog
2021-12-28 01:11:06 -05:00
df90b3e66a
Document move_account API
...
Ref: emit-move
2021-12-28 01:10:39 -05:00
0af77b20c1
Implement moving account
...
Ref: emit-move
2021-12-28 01:10:34 -05:00
52a3f0f08b
Merge branch 'ensure-staff-privileged-strict' into 'develop'
...
EnsureStaffPrivilegedPlug: don't let non-moderators through
See merge request pleroma/pleroma!3582
2021-12-28 00:53:11 +00:00
5c80d4087d
PleromaAPI.AppView: add test
2021-12-27 18:52:34 -06:00
7704a722c0
AppController: remove unnecessary `require Logger`
2021-12-27 18:30:16 -06:00
cb2a072e62
Apps: add test for get_user_apps/1
2021-12-27 18:29:03 -06:00
2e4a1c56c3
AppController: test creating with and without a user
2021-12-27 18:14:15 -06:00
fa35e24a5e
Apps: add user_id index
2021-12-27 18:05:35 -06:00
f5c3d45120
Merge remote-tracking branch 'origin/develop' into apps-api-endpoint
2021-12-27 18:01:25 -06:00
138f5a4517
EnsureStaffPrivilegedPlug: don't let non-moderators through
2021-12-27 17:18:26 -06:00
264f0fde1b
Merge branch 'admin-fix-duplicated-endpoints' into 'develop'
...
AdminAPI: fix duplicated routes
See merge request pleroma/pleroma!3581
2021-12-27 23:12:14 +00:00
a3fa987611
AdminAPI: fix duplicated routes
2021-12-27 16:58:10 -06:00
fd9260d1b5
Merge branch 'finch' into 'develop'
...
Finch support
See merge request pleroma/pleroma!3565
2021-12-27 18:27:13 +00:00
9b5dbd20b0
Merge branch 'tag-gun-erratic' into 'develop'
...
ConnectionPoolTest: tag erratic test
See merge request pleroma/pleroma!3580
2021-12-27 17:41:28 +00:00
326575d5b7
Merge remote-tracking branch 'origin/develop' into finch
2021-12-27 11:31:15 -06:00
d61a5515e6
ConnectionPoolTest: tag erratic test
2021-12-27 11:27:25 -06:00
a659428024
Merge branch 'restricted-moderators' into 'develop'
...
AdminAPI: Optionally restrict moderators from accessing sensitive data
See merge request pleroma/pleroma!3578
2021-12-27 17:06:22 +00:00
Alex Gleason
Sean King
lain
Ivan Tashkinov
marcin mikołajczak
Tusooa Zhu