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
|
e7b1df7252
|
Fix sporadic test compilation failure caused by unused alias
|
2020-05-01 22:50:40 +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 |
|
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 |
|