Commit graph

9563 commits

Author SHA1 Message Date
lain 2008fa9c7f Merge branch 'fix/captcha' into 'develop'
Fix account registration when captcha is enabled but not provided

Closes #1712

See merge request pleroma/pleroma!2438
2020-05-01 11:47:58 +00:00
lain ab01863abf Merge branch 'feature/delete-validator' of git.pleroma.social:pleroma/pleroma into feature/delete-validator 2020-05-01 13:35:42 +02:00
lain 5f42e6629d DeleteValidator: Only allow deletion of certain types. 2020-05-01 13:34:47 +02:00
Alexander Strizhakov ecf37b46d2
pagination fix for service users filters 2020-05-01 14:31:24 +03:00
Ivan Tashkinov 92efb888c7 Made follow request notifications non-optional (removed config switch). 2020-05-01 09:51:41 +03:00
Maksim Pechnikov a92c713d9c Merge branch 'develop' into issue/1276-2 2020-05-01 06:21:59 +03:00
rinpatch 0dd863f8f5 Merge branch 'update/admin-fe-20200429' into 'develop'
Update AdminFE build in preparation for the 2.0.3 release

See merge request pleroma/pleroma!2442
2020-04-30 22:33:56 +00:00
lain da4b79a56d Merge branch 'tests/more-apc2s' into 'develop'
Increase tests on AP C2S

See merge request pleroma/pleroma!2449
2020-04-30 22:19:26 +00:00
Lain Soykaf 93f64aba78 Merge branch 'develop' of ssh://git.pleroma.social/pleroma/pleroma into feature/delete-validator 2020-04-30 22:44:31 +02:00
lain 32b8386ede DeleteValidator: Don't federate local deletions of remote objects.
Closes #1497
2020-04-30 21:23:18 +02:00
lain a81342a234 Merge branch 'dismiss-notification-on-follow-request-rejection' into 'develop'
Dismiss the follow request notification on rejection

See merge request pleroma/pleroma!2447
2020-04-30 18:38:52 +00:00
lain 999d639873 ActivityPub: Remove delete function.
This is handled by the common pipeline now.
2020-04-30 20:13:47 +02:00
lain 3b443cbc1d User: Use common pipeline to delete user activities 2020-04-30 20:08:25 +02:00
lain 5da08c2b73 SideEffects: Fix comment 2020-04-30 19:53:30 +02:00
lain 500f5ec14e SideEffects: On deletion, reduce the reply count cache 2020-04-30 19:47:13 +02:00
Haelwenn (lanodan) Monnier f1523f9acd
Increase tests on AP C2S
Related: https://git.pleroma.social/pleroma/pleroma/-/issues/954
2020-04-30 18:56:57 +02:00
lain 60db58a1c6 Credo fixes. 2020-04-30 18:38:37 +02:00
lain ab60ee1776 SideEffects: On deletion, reduce the User note count. 2020-04-30 18:19:39 +02:00
lain 3d0dc58e2e SideEffectsTest: Test streaming. 2020-04-30 18:10:36 +02:00
Haelwenn 55a3a3c3e5 Merge branch 'emoji-upload' into 'develop'
Updated emoji API endpoints

Closes #1649, #1604, and #1545

See merge request pleroma/pleroma!2179
2020-04-30 16:09:51 +00:00
lain 315b773dd9 ObjectValidator: Refactor. 2020-04-30 17:58:31 +02:00
lain c832d96fc9 SideEffects: Stream out deletes. 2020-04-30 17:58:09 +02:00
lain 4500fdc04c DeleteValidator: Add internal helper field after validation. 2020-04-30 17:53:02 +02:00
lain 143353432a StreamerTest: Separate deletion test. 2020-04-30 17:52:29 +02:00
eugenijm bef34568f0 Dismiss the follow request notification on rejection 2020-04-30 18:38:19 +03:00
Ivan Tashkinov 2c4844237f Refactoring of :if_func / :unless_func plug options (general availability). Added tests for Pleroma.Web.Plug. 2020-04-30 18:19:51 +03:00
Alexander Strizhakov 4a487e4d0b
fix for auth check 2020-04-30 17:50:57 +03:00
lain 14c6672193 AP C2S: Use common pipelin for deletes. 2020-04-30 16:49:41 +02:00
lain fdd8e7f276 CommonAPI: Use common pipeline for deletions. 2020-04-30 16:15:38 +02:00
lain c9bfa51ea9 Credo fixes. 2020-04-30 15:58:37 +02:00
lain 417eed4a2b SideEffects: Handle deletions. 2020-04-30 15:57:27 +02:00
lain 1fb383f368 DeleteValidator: Deleting a user is valid. 2020-04-30 15:42:30 +02:00
lain 4dc5302f45 Transmogrifier: Handle incoming deletes for non-user objects. 2020-04-30 15:26:23 +02:00
Alexander Strizhakov 631e8c1feb
docs update 2020-04-30 16:09:23 +03:00
Alexander Strizhakov 1fd40532ae
docs fix 2020-04-30 16:09:23 +03:00
Alexander Strizhakov 1c1b7e22af
list of options for pack metadata 2020-04-30 16:09:22 +03:00
Alexander Strizhakov 36abeedf9f
error rename 2020-04-30 16:09:22 +03:00
Alexander Strizhakov 9855018425
changelog entry 2020-04-30 16:09:22 +03:00
Alexander Strizhakov ddb757f743
emoji api packs changes in routes with docs update 2020-04-30 16:09:18 +03:00
Alexander Strizhakov f3070ddae5
removing entry from changelog 2020-04-30 15:45:57 +03:00
Alexander Strizhakov 95759310ab
docs update 2020-04-30 15:45:56 +03:00
Alexander Strizhakov 342f55fb92
refactor emoji api with fixes 2020-04-30 15:45:52 +03:00
lain db184a8eb4 DeleteValidator: Mastodon sends unaddressed deletes. 2020-04-30 14:37:14 +02:00
Alexander Strizhakov 5839e67eb8
return data only for updated emoji 2020-04-30 15:24:02 +03:00
lain bd219ba7e8 Transmogrifier Tests: Extract deletion tests. 2020-04-30 14:14:00 +02:00
lain 42ce7c5164 ObjectValidator: Add actor fetcher. 2020-04-30 14:13:08 +02:00
lain 64bb72f98a Typo fix. 2020-04-30 13:57:47 +02:00
lain 4c4344b7b1 Merge branch '1364-no-pushes-from-blocked-domains-users' into 'develop'
[#1364] [FIX] Disabled notifications on activities from blocked domains (unless actors are followed)

See merge request pleroma/pleroma!2367
2020-04-30 10:29:46 +00:00
Egor Kislitsyn 9c1adb35de
Merge branch 'develop' into openapi/notifications 2020-04-30 13:52:07 +04:00
Egor Kislitsyn 1898054da4
Merge branch 'develop' into openapi/reports 2020-04-30 13:51:27 +04:00