itepechi/akkoma
1
0
Fork 0
Code Issues Pull requests Releases Activity
11828 commits 3 branches 2 tags 276 MiB
Commit graph

11828 commits

This branch
This branch
All branches
Author SHA1 Message Date
lain
607e06c245 Merge branch 'openapi/reports' into 'develop' 
Add OpenAPI spec for ReportController

See merge request pleroma/pleroma!2434
 2020-05-01 12:48:56 +00:00
lain
44fbd09709 Merge branch 'issue/1577' into 'develop' 
[#1577] fix mediaType of object

See merge request pleroma/pleroma!2372
 2020-05-01 12:38:46 +00:00
lain
1ead5f49b8 AdminApiController: Use common pipeline for user deletion. 2020-05-01 14:30:39 +02:00
lain
ebbd9c7f36 AdminAPIController: Refactor. 2020-05-01 14:22:39 +02:00
lain
51f1dbf0a2 User deletion mix task: Use common pipeline. 2020-05-01 14:05:25 +02:00
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
rinpatch
138e6ece1b Merge branch 'following-relationships-optimizations' into 'develop' 
FollowingRelationship storage & performance optimizations

See merge request pleroma/pleroma!2332
 2020-05-01 14:31:26 +03: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
Haelwenn
fb9ec885cc Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop' 
Added need_reboot endpoint to admin api

Closes #1677

See merge request pleroma/pleroma!2373
 2020-05-01 01:38:25 +03:00
lain
a4afeed426 Uploads: Sandbox them in the CSP. 2020-05-01 01:37:26 +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
Mark Felder
8cf4e1619e Fix Oban not receiving :ok from RichMediaHelper job 2020-05-01 01:11:51 +03:00
Ivan Tashkinov
862d4886c9 [#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality. 2020-05-01 01:00:37 +03:00
rinpatch
da4923f2e5 Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop' 
Enforcement of OAuth scopes check for authenticated API endpoints

See merge request pleroma/pleroma!2349
 2020-05-01 00:58:40 +03:00
lain
1ebf8db2a5 Merge branch 'fix-object_age_policy' into 'develop' 
Fix ObjectAgePolicy

See merge request pleroma/pleroma!2404
 2020-05-01 00:55:37 +03:00
Haelwenn (lanodan) Monnier
0d74e38f5f mix.exs: Do not bail out when .git doesn’t exists 2020-05-01 00:55:37 +03:00
Haelwenn
2ff3b85326 Merge branch 'bugfix/1670-user-count' into 'develop' 
Stats: Ignore internal users for user count.

Closes #1670

See merge request pleroma/pleroma!2414
 2020-05-01 00:55:37 +03:00
Haelwenn
bf4b5f3856 Merge branch 'fix/follow-and-blocks-import' into 'develop' 
Fix follower/blocks import when nicknames starts with @

Closes #1698

See merge request pleroma/pleroma!2416
 2020-05-01 00:55:37 +03:00
lain
2e58fe08cd CommonAPI: Don't make repeating announces possible 2020-05-01 00:55:34 +03:00
Alex Gleason
6e0b046771 Let blob: pass CSP 2020-05-01 00:40:09 +03:00
eugenijm
78391a00c5 Mastodon API: do not create a following relationship if the corresponding follow request doesn't exist when calling POST /api/v1/follow_requests/:id/authorize 2020-05-01 00:39:23 +03:00
rinpatch
61889e00fc Deactivate local users on deletion instead of deleting the record 
Prevents the possibility of re-registration, which allowed to read
DMs of the deleted account.

Also includes a migration that tries to find any already deleted
accounts and insert skeletons for them.

Closes pleroma/pleroma#1687
 2020-05-01 00:38:58 +03: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