Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,951 Commits 1 Branch 0 Tags 222 MiB
bb8c0614ef
Commit Graph

11951 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rinpatch
9e3ec58280 Merge branch 'follow-request-notifications' into 'develop' 
Follow request notifications enforcement

See merge request pleroma/pleroma!2451
 2020-05-02 12:24:49 +00:00
rinpatch
8ea522b4b6 Merge branch 'pleroma-fe-2020-05-02-5f90b6a3' into 'develop' 
PleromaFE bundle supporting follow request notifications

See merge request pleroma/pleroma!2462
 2020-05-02 12:24:22 +00:00
Ivan Tashkinov
f1bba5c787 PleromaFE bundle supporting follow request notifications. 
5f90b6a384
 2020-05-02 14:37:40 +03:00
Haelwenn
0dfb5ad0ad Merge branch 'bugfix/static-fe.css' into 'develop' 
static-fe.css: Restore and move to /priv/static/static-fe

See merge request pleroma/pleroma!2458
 2020-05-02 06:37:33 +00:00
Haelwenn (lanodan) Monnier
c6ddfa8f95
static-fe.css: Restore and move to /priv/static/static-fe 2020-05-02 08:28:42 +02:00
Ivan Tashkinov
cf5ca7e45b Merge remote-tracking branch 'remotes/origin/develop' into follow-request-notifications 2020-05-02 07:39:19 +03:00
rinpatch
ae921a0c24 Merge branch 'fix/sporadic-test-failure-alias' into 'develop' 
Fix sporadic test compilation failure caused by unused alias

See merge request pleroma/pleroma!2460
 2020-05-01 22:01:35 +00:00
rinpatch
b1e2ad3f27 Merge branch 'fix/notificatons-follow-request-validation' into 'develop' 
OpenAPI: Add `follow_request` to notification types

Closes #1731

See merge request pleroma/pleroma!2459
 2020-05-01 20:22:37 +00:00
rinpatch
c18ef452b0 OpenAPI: Add follow_request to notification types 
Closes #1731
 2020-05-01 23:14:20 +03:00
rinpatch
2646fdea22 signature.ex: Remove the use of ObjectID type 
It is not in stable yet
 2020-05-01 22:56:18 +03:00
rinpatch
e7b1df7252 Fix sporadic test compilation failure caused by unused alias 2020-05-01 22:50:40 +03:00
rinpatch
b6ca8cc539 Merge branch 'bugfix/1727-fix-signature-decoding' into 'develop' 
Bugfix/1727 fix signature decoding

Closes #1727

See merge request pleroma/pleroma!2454
 2020-05-01 22:10:42 +03:00
Mark Felder
06fbb95715 Update AdminFE build in preparation for the 2.0.3 release 2020-05-01 21:56:48 +03:00
lain
4c0af1cb66 Merge branch 'fix/openapi-limit' into 'develop' 
OpenAPI: Remove max pagination limit from the spec

See merge request pleroma/pleroma!2457
 2020-05-01 18:46:18 +00:00
rinpatch
85105f7aae OpenAPI: Remove max pagination limit from the spec 
In an ideal world clients wouldn't try to request more than the max
hardcoded limit, but SubwayTooter does.
 2020-05-01 21:33:34 +03:00
rinpatch
ed8282c091 Merge branch 'bugfix/1727-fix-signature-decoding' into 'develop' 
Bugfix/1727 fix signature decoding

Closes #1727

See merge request pleroma/pleroma!2454
 2020-05-01 16:48:31 +00:00
Ivan Tashkinov
d5cdc907e3 Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering). 
Added support for :skip_notifications for accounts listing (index.json).
Adjusted tests.
 2020-05-01 18:45:24 +03:00
lain
ed4e9e6435 Merge branch 'fix-notifications-loading-in-pleroma-fe' into 'develop' 
Notifications loading fix (PleromaFE)

See merge request pleroma/pleroma!2455
 2020-05-01 15:38:36 +00:00
Ivan Tashkinov
57b31e79c2 Updated PleromaFE bundle to prevent notifications loading issue due to unsupported parameter (with_move). 2020-05-01 17:59:29 +03:00
lain
3453e54e6b MappedSignatureToIdentityPlug: Fix. 2020-05-01 15:58:47 +02:00
lain
a912f72a36 Signature: Handle non-ap ids in key ids. 
Mastodon and Gab sometimes send the format `acct:name@server`.
 2020-05-01 15:54:38 +02:00
Alexander Strizhakov
aea781cbd8
credo fix 2020-05-01 16:31:05 +03:00
lain
3370bb0e46 Merge branch 'openapi/notifications' into 'develop' 
Add OpenAPI spec for NotificationController

See merge request pleroma/pleroma!2437
 2020-05-01 13:09:36 +00:00
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