Ivan Tashkinov
|
13926537b6
|
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
|
2019-12-06 00:26:31 +03:00 |
|
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).
|
2019-12-06 00:25:44 +03:00 |
|
Egor Kislitsyn
|
c4b468a95b
|
Cleanup tests output
|
2019-11-28 16:44:48 +07:00 |
|
Maxim Filippov
|
82f4e4760e
|
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
|
2019-11-25 01:46:18 +09:00 |
|
Maxim Filippov
|
b88dbc17c8
|
Fix tests
|
2019-11-19 22:50:24 +09:00 |
|
Maxim Filippov
|
46eb160135
|
AdminAPI: Confirm user account, resend confirmation email
|
2019-11-19 20:14:02 +09:00 |
|
Maxim Filippov
|
114930b5fd
|
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
|
2019-11-14 23:45:29 +09:00 |
|
Maxim Filippov
|
30af5da330
|
Admin API: list all statuses from a given instance
|
2019-11-14 23:44:07 +09:00 |
|
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
|
2019-11-14 13:35:41 +00:00 |
|
Alexander
|
6a4201e0b4
|
fix for migrate task
|
2019-11-10 22:54:37 +03:00 |
|
Maxim Filippov
|
b14bf9044f
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
2019-11-08 18:30:49 +09:00 |
|
Maxim Filippov
|
f171095960
|
Grouped reports with status data baked in
|
2019-11-06 21:25:46 +10:00 |
|
Maxim Filippov
|
2cbfa256fd
|
Merge branch 'develop' into feature/multiple-users-force-password-reset
|
2019-11-05 11:36:47 +10:00 |
|
Maxim Filippov
|
43ea16870f
|
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
|
2019-11-05 02:12:48 +03:00 |
|
Maxim Filippov
|
743b622b7b
|
Force password reset for multiple users
|
2019-11-01 18:45:47 +03:00 |
|
Maxim Filippov
|
6f9d3d30fa
|
AdminAPI: Omit relay user from users list
|
2019-10-31 02:26:02 +03:00 |
|
Egor Kislitsyn
|
4c1dd55c48
|
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
|
2019-10-24 14:55:36 +07:00 |
|
Egor Kislitsyn
|
c6fba62666
|
Fix Relay
|
2019-10-21 14:47:07 +07:00 |
|
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
|
2019-10-20 20:43:18 +03:00 |
|
Maxim Filippov
|
2473702be2
|
Merge branch 'develop' into feature/relay-list
|
2019-10-18 10:24:29 +02:00 |
|
Ivan Tashkinov
|
10ff01acd9
|
[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
|
2019-10-16 21:59:21 +03:00 |
|
Maxim Filippov
|
da0e4879bc
|
DELETE /api/pleroma/admin/users now accepts nicknames array
|
2019-10-15 17:33:29 +02:00 |
|
Maxim Filippov
|
cc6875b582
|
Add GET /api/pleroma/admin/relay endpoint - lists all followed relays
|
2019-10-11 19:12:29 +03:00 |
|
Maxim Filippov
|
aaa4252f41
|
Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
|
2019-10-11 15:58:45 +03:00 |
|
Maxim Filippov
|
f5104f36bb
|
Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
|
2019-10-11 00:24:31 +03:00 |
|
Maxim Filippov
|
ad42837244
|
Ability to toggle activation status and permission group for a group of users
|
2019-10-09 17:03:54 +03:00 |
|
Maxim Filippov
|
7aceaa517b
|
Admin API: Reports, grouped by status
|
2019-10-07 15:39:07 +03:00 |
|
Maxim Filippov
|
8dcc2f9f5e
|
Admin API: Allow changing the state of multiple reports at once
|
2019-10-04 19:00:58 +03:00 |
|
Egor Kislitsyn
|
e7aef27c00
|
Fix merge
|
2019-09-30 19:10:54 +07:00 |
|
Egor Kislitsyn
|
98d1347a4e
|
Extract status actions from MastodonAPIController into StatusController
|
2019-09-27 10:51:15 +07:00 |
|
Maxim Filippov
|
e7836adf21
|
Merge branch 'develop' into feature/moderation-log-filters
|
2019-09-26 19:01:54 +03:00 |
|
Maxim Filippov
|
5e9759cd7d
|
Merge branch 'develop' into feature/return-link-for-password-reset
|
2019-09-24 13:00:48 +03:00 |
|
kaniini
|
29dd8ab9c0
|
Merge branch 'feature/force-password-reset' into 'develop'
Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705
|
2019-09-23 22:42:34 +00:00 |
|
Steven Fuchs
|
e1d2d69c87
|
Clean up views
|
2019-09-23 22:33:59 +00:00 |
|
Maxim Filippov
|
02bbcd6180
|
Merge branch 'develop' into feature/return-link-for-password-reset
|
2019-09-22 16:58:39 +03:00 |
|
Maxim Filippov
|
72a01f1350
|
Use router helper to generate reset password link
|
2019-09-22 16:36:59 +03:00 |
|
Maxim Filippov
|
6f25668215
|
Admin API: Add ability to force user's password reset
|
2019-09-22 16:08:07 +03:00 |
|
rinpatch
|
b0ec82d24a
|
Merge branch 'chores/bump-copyright-year' into 'develop'
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
|
2019-09-18 21:57:49 +00:00 |
|
Haelwenn (lanodan) Monnier
|
447514dfa2
|
Bump copyright years of files changed in 2019
Done via the following command:
git diff 1e6c102bfc --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
|
2019-09-18 23:21:11 +02:00 |
|
Alex S
|
4faf2b1555
|
post for creating invite tokens in admin api
|
2019-09-18 10:49:14 +03:00 |
|
Maxim Filippov
|
df15ed13d1
|
Merge branch 'develop' into feature/moderation-log-filters
|
2019-09-16 19:44:06 +03:00 |
|
Maxim Filippov
|
219dca1b00
|
Merge branch 'develop' into feature/return-total-for-reports
|
2019-09-16 14:40:17 +03:00 |
|
Ivan Tashkinov
|
6bcedb693c
|
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# docs/config.md
# mix.lock
|
2019-09-14 16:11:44 +03:00 |
|
Alex S
|
a1f2dfb10a
|
expanding regex sigils to use modifiers
|
2019-09-11 09:25:33 +03:00 |
|
Maxim Filippov
|
af746fa4a8
|
Return total for reports
|
2019-09-04 20:08:13 +03:00 |
|
Maxim Filippov
|
6c2fd1b78b
|
Fix tests
|
2019-09-01 21:38:15 +03:00 |
|
Ivan Tashkinov
|
e890ea7e82
|
[#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# config/config.exs
|
2019-08-31 14:25:43 +03:00 |
|
Maxim Filippov
|
f182f0f6bd
|
Add ability to search moderation logs
|
2019-08-31 00:57:15 +03:00 |
|
Maxim Filippov
|
5e4fde1d3d
|
Filter logs by date
|
2019-08-27 20:48:16 +03:00 |
|
Maxim Filippov
|
c338224c93
|
Fix sporadic test
|
2019-08-26 17:24:22 +03:00 |
|