Maxim Filippov
|
a7f77785c2
|
Implement report notes destruction
|
2019-12-08 11:27:23 +03:00 |
Ivan Tashkinov
|
1770602747
|
[#1427] Extra check that admin OAuth scope is used by admin. Adjusted tests.
|
2019-12-07 17:49:53 +03:00 |
Ivan Tashkinov
|
40e1817f70
|
[#1427] Fixes / improvements of admin scopes support. Added tests.
|
2019-12-06 20:33:47 +03:00 |
Maxim Filippov
|
08c89fd2b8
|
Fix incorrect report count
|
2019-12-06 17:17:24 +09:00 |
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 |
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
|
2019-12-05 13:34:34 +00:00 |
Maxim Filippov
|
4453a9cb73
|
Add failing test, which exposes a bug
|
2019-12-05 12:07:53 +09:00 |
Maxim Filippov
|
4b60d41db9
|
Add report notes
|
2019-12-04 00:26:37 +09:00 |
Egor Kislitsyn
|
c4b468a95b
|
Cleanup tests output
|
2019-11-28 16:44:48 +07:00 |
Maxim Filippov
|
fcabcab443
|
Fetch account from report, not from status (it might be deleted)
|
2019-11-28 00:09:00 +09:00 |
Maxim Filippov
|
5135656f57
|
Handle reopened reports with deleted statuses
|
2019-11-27 22:54:12 +09:00 |
Maxim Filippov
|
5869a43fe7
|
Fix tests
|
2019-11-26 01:06:54 +09:00 |
Maxim Filippov
|
b62be2564c
|
Merge branch 'develop' into feature/admin-api-render-whole-status
|
2019-11-26 00:25:43 +09: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
|
2b341627da
|
Admin API: Render whole status in grouped reports
|
2019-11-25 00:04:29 +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 |
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 |
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 |
Maxim Filippov
|
37dd3867bb
|
Log admin/moderator actions
|
2019-08-25 19:39:37 +00:00 |
lain
|
90986667ce
|
Merge branch 'admin-create-users' into 'develop'
user creation admin api will create multiple users
See merge request pleroma/pleroma!1170
|
2019-08-24 16:04:19 +00:00 |
Ivan Tashkinov
|
71700ea6d4
|
[#1149] Updated docs & tests.
|
2019-08-24 09:27:32 +03:00 |
Maksim
|
a320358703
|
added test helpers to clear config after tests
|
2019-08-19 15:34:29 +00:00 |
Alexander Strizhakov
|
de0f3b73dd
|
Admin fixes
|
2019-08-03 18:16:09 +00:00 |
Egor Kislitsyn
|
f98235f2ad
|
Clean up tests output
|
2019-08-01 16:33:36 +07:00 |
Alexander Strizhakov
|
51b3b6d816
|
Admin changes
|
2019-07-30 16:36:05 +00:00 |
Maxim Filippov
|
f46805bb40
|
Merge branch 'develop' into feature/admin-api-user-statuses
|
2019-07-24 02:42:28 +03:00 |
Maxim Filippov
|
03471151d6
|
AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)
|
2019-07-24 01:51:36 +03:00 |
Alexander Strizhakov
|
5e72554f3c
|
Admin config fix
|
2019-07-23 19:17:00 +00:00 |
Sergey Suprunenko
|
05b5af8075
|
Add tests for users tasks and PleromaAuthenticator
|
2019-07-22 02:43:15 +00:00 |
Maxim Filippov
|
9570a5be40
|
Merge branch 'develop' into feature/admin-api-user-statuses
|
2019-07-18 23:38:38 +03:00 |
Alex S
|
c66044b923
|
atom keys with leading :
|
2019-07-15 11:00:55 +03:00 |
Maxim Filippov
|
a9459ff98f
|
Admin API: Endpoint for fetching latest user's statuses
|
2019-07-14 00:37:26 +03:00 |
Alexander Strizhakov
|
846ad9a463
|
admin api configure changes
|
2019-07-11 13:02:13 +00:00 |
Sergey Suprunenko
|
ff55e3c16f
|
Create mentions only for explicitly mentioned users
|
2019-07-10 13:29:50 +00:00 |
Maxim Filippov
|
90927e6a9a
|
Kowalski, analysis!
|
2019-06-28 15:27:18 +03:00 |
Maxim Filippov
|
452ca5250d
|
Merge admin and mastodon user views for reports
|
2019-06-28 15:15:32 +03:00 |
Alex S
|
982cad0268
|
support for config groups
|
2019-06-23 08:16:16 +03:00 |
Alex S
|
410add1c30
|
support for tuples with more than 2 values
|
2019-06-22 17:30:53 +03:00 |
Alex S
|
f0fccb7578
|
fix for int and modules
|
2019-06-22 09:01:30 +03:00 |
Alexander Strizhakov
|
32320c1ee9
|
Fixes for dynamic configuration
|
2019-06-20 17:43:57 +00:00 |
Alexander Strizhakov
|
c2ca1f22a2
|
it is changed in compile time
we can't change module attributes and endpoint settings in runtime
|
2019-06-14 15:45:05 +00:00 |
Sachin Joshi
|
e394fc2eef
|
fix the flaky test for users creation by admin
|
2019-06-02 09:49:59 +05:45 |
Sachin Joshi
|
ad5263c647
|
Merge remote-tracking branch 'upstream/develop' into admin-create-users
|
2019-06-01 11:42:37 +05:45 |
Sachin Joshi
|
5534d4c676
|
make bulk user creation from admin works as a transaction
|
2019-06-01 11:17:53 +05:45 |
Maksim
|
db94294dfb
|
[#936] fix tests
|
2019-05-29 14:04:58 +00:00 |
Aaron Tinio
|
f76268135c
|
Fix failing test
|
2019-05-22 07:16:11 +08:00 |
Sachin Joshi
|
5c028b8f92
|
user creation admin api will create multiple users
|
2019-05-17 12:21:58 +05:45 |
Sergey Suprunenko
|
e2b3a27204
|
Add Reports to Admin API
|
2019-05-16 19:09:18 +00:00 |
Sachin Joshi
|
f01f995816
|
make url uniform in admin api
|
2019-05-11 14:46:00 +05:45 |
Alexander Strizhakov
|
bfeb33e951
|
Merge develop
Merge conflict in lib/pleroma/activity.ex
|
2019-05-08 14:34:36 +00:00 |
Egor
|
b9cdf6d3b9
|
Use `User.get_cached*` everywhere
|
2019-04-22 07:20:43 +00:00 |
Alex S
|
c5d0fffeaf
|
naming fix
|
2019-04-13 14:55:42 +07:00 |
Alex S
|
fe511a6c65
|
Merge branch 'develop' into feature/788-separate-email-addresses
|
2019-04-10 18:06:54 +07:00 |
Alex S
|
fe13a1d78c
|
adding notify_email setting for trigger emails
|
2019-04-10 17:57:41 +07:00 |
Ivan Tashkinov
|
44829d9181
|
AdminApiControllerTest unused variables fix.
|
2019-04-08 12:32:55 +03:00 |
Alex S
|
012bb5dcc9
|
renaming expire_at -> expires_at
keyword style change
|
2019-04-08 16:01:28 +07:00 |
Alex S
|
b810aac117
|
added docs to docs/api/admin_api.md
code style and little renamings
|
2019-04-07 19:48:52 +07:00 |
Alex S
|
dcc54f8cfa
|
admin api endpoints for invites
|
2019-04-06 20:25:19 +07:00 |
Mark Felder
|
fac76bfa35
|
We actually want the user id not nickname in the test...
|
2019-04-05 12:11:19 -05:00 |
Mark Felder
|
c746087f57
|
Also remove Repo functions in the tests
|
2019-04-05 11:59:56 -05:00 |