Alexander Strizhakov
|
1630ecaa20
|
Merge branch 'develop' into admin-be
|
5 years ago |
|
Alexander Strizhakov
|
d933fd3d61
|
more renamings
|
5 years ago |
|
Alexander Strizhakov
|
7d128ca208
|
dynamic_configuration renaming
and moving it from instance settings
|
5 years ago |
|
Alexander Strizhakov
|
88a16bb9fc
|
deep merge in config update
|
5 years ago |
|
Alexander
|
c841174de8
|
flag for delete fix
|
5 years ago |
|
Alexander
|
0b02040327
|
little fixes and typos fix
|
5 years ago |
|
Alexander
|
9c1f3bfeff
|
fixes for logger backends
|
5 years ago |
|
Alexander
|
063ab6d911
|
logger backends fix
|
5 years ago |
|
Alexander
|
583cee4607
|
parsing proxy url setting
|
5 years ago |
|
Alexander
|
fea734ca70
|
errors on endpoints
|
5 years ago |
|
Alexander
|
5cacb988b9
|
partially settings update
|
5 years ago |
|
Alexander
|
0656816c77
|
tests for setttings without an explicit key
|
5 years ago |
|
Alex S
|
2753285b77
|
config editing through database
|
5 years ago |
|
Ivan Tashkinov
|
7973cbdb9f
|
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
|
5 years ago |
|
Maxim Filippov
|
3ecf131511
|
Merge branch 'develop' into feature/report-notes
|
5 years ago |
|
Ivan Tashkinov
|
835ac2157c
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
# Conflicts:
# CHANGELOG.md
|
5 years ago |
|
Maxim Filippov
|
a7f77785c2
|
Implement report notes destruction
|
5 years ago |
|
Ivan Tashkinov
|
1770602747
|
[#1427] Extra check that admin OAuth scope is used by admin. Adjusted tests.
|
5 years ago |
|
Ivan Tashkinov
|
40e1817f70
|
[#1427] Fixes / improvements of admin scopes support. Added tests.
|
5 years ago |
|
Maxim Filippov
|
08c89fd2b8
|
Fix incorrect report count
|
5 years ago |
|
Ivan Tashkinov
|
13926537b6
|
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
|
5 years ago |
|
Ivan Tashkinov
|
af42c00cff
|
[#1427] Reworked admin scopes support.
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
|
5 years ago |
|
feld
|
d0bd4348b3
|
Merge branch 'feature/admin-api-render-whole-status' into 'develop'
Miscellaneous grouped reports fixes
Closes admin-fe#48 and admin-fe#51
See merge request pleroma/pleroma!2007
|
5 years ago |
|
Maxim Filippov
|
4453a9cb73
|
Add failing test, which exposes a bug
|
5 years ago |
|
Maxim Filippov
|
4b60d41db9
|
Add report notes
|
5 years ago |
|
Egor Kislitsyn
|
c4b468a95b
|
Cleanup tests output
|
5 years ago |
|
Maxim Filippov
|
fcabcab443
|
Fetch account from report, not from status (it might be deleted)
|
5 years ago |
|
Maxim Filippov
|
5135656f57
|
Handle reopened reports with deleted statuses
|
5 years ago |
|
Maxim Filippov
|
5869a43fe7
|
Fix tests
|
5 years ago |
|
Maxim Filippov
|
b62be2564c
|
Merge branch 'develop' into feature/admin-api-render-whole-status
|
5 years ago |
|
Maxim Filippov
|
82f4e4760e
|
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
|
5 years ago |
|
Maxim Filippov
|
2b341627da
|
Admin API: Render whole status in grouped reports
|
5 years ago |
|
Maxim Filippov
|
b88dbc17c8
|
Fix tests
|
5 years ago |
|
Maxim Filippov
|
46eb160135
|
AdminAPI: Confirm user account, resend confirmation email
|
5 years ago |
|
Maxim Filippov
|
114930b5fd
|
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
|
5 years ago |
|
Maxim Filippov
|
30af5da330
|
Admin API: list all statuses from a given instance
|
5 years ago |
|
feld
|
1afeaf82fa
|
Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
Admin API: Grouped reports, update multiple reports in one query
Closes admin-fe#43
See merge request pleroma/pleroma!1815
|
5 years ago |
|
Alexander
|
6a4201e0b4
|
fix for migrate task
|
5 years ago |
|
Maxim Filippov
|
b14bf9044f
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
5 years ago |
|
Maxim Filippov
|
f171095960
|
Grouped reports with status data baked in
|
5 years ago |
|
Maxim Filippov
|
2cbfa256fd
|
Merge branch 'develop' into feature/multiple-users-force-password-reset
|
5 years ago |
|
Maxim Filippov
|
43ea16870f
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
5 years ago |
|
Maxim Filippov
|
743b622b7b
|
Force password reset for multiple users
|
5 years ago |
|
Maxim Filippov
|
6f9d3d30fa
|
AdminAPI: Omit relay user from users list
|
5 years ago |
|
Egor Kislitsyn
|
4c1dd55c48
|
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
|
5 years ago |
|
Egor Kislitsyn
|
c6fba62666
|
Fix Relay
|
5 years ago |
|
Ivan Tashkinov
|
c6fdfbc4f1
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
|
5 years ago |
|
Maxim Filippov
|
2473702be2
|
Merge branch 'develop' into feature/relay-list
|
5 years ago |
|
Ivan Tashkinov
|
10ff01acd9
|
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
|
5 years ago |
|
Maxim Filippov
|
da0e4879bc
|
DELETE /api/pleroma/admin/users now accepts nicknames array
|
5 years ago |
