Henry Jameson
74db8f4769
Merge remote-tracking branch 'origin/develop' into shigusegubu
...
* origin/develop: (381 commits)
CHANGELOG.md: Add entry for re-registration ban
Reword changelog entry for follow relationship bug
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`
Deactivate local users on deletion instead of deleting the record
[#1732 ] Made AP C2S :followers and :following endpoints serve on no auth (as for related :api pipeline endpoints).
PleromaFE bundle supporting follow request notifications. 5f90b6a384
2020-05-02 20:03:41 +03:00
rinpatch
3126f8a334
Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
...
Feature/1710 consolidate instance info
Closes #1710
See merge request pleroma/pleroma!2430
2020-05-02 16:44:55 +00:00
rinpatch
d589f3dcfb
CHANGELOG.md: Add entry for re-registration ban
2020-05-02 19:05:13 +03:00
rinpatch
9a92e5a351
Reword changelog entry for follow relationship bug
2020-05-02 19:05:13 +03:00
eugenijm
66a8e1312d
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-02 19:05:13 +03:00
rinpatch
e55876409b
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-02 19:05:13 +03:00
rinpatch
e186d9941d
Merge branch 'fix/1732-authless-following-followers' into 'develop'
...
[FIX] [#1732 ] Made AP C2S :followers and :following endpoints serve on no auth
Closes #1732
See merge request pleroma/pleroma!2463
2020-05-02 15:39:31 +00:00
Ivan Tashkinov
2d07ed7747
[ #1732 ] Made AP C2S :followers and :following endpoints serve on no auth
...
(as for related :api pipeline endpoints).
2020-05-02 18:28:04 +03:00
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
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
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
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
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
Ivan Tashkinov
92efb888c7
Made follow request notifications non-optional (removed config switch).
2020-05-01 09:51:41 +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
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
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
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
eugenijm
bef34568f0
Dismiss the follow request notification on rejection
2020-04-30 18:38:19 +03:00
Alexander Strizhakov
4a487e4d0b
fix for auth check
2020-04-30 17:50:57 +03: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
Alexander Strizhakov
5839e67eb8
return data only for updated emoji
2020-04-30 15:24:02 +03: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
