Commit Graph

351 Commits

Author SHA1 Message Date
eugenijm ad22e94f33 Exclude private and direct statuses visible to the admin when using godmode 2020-03-05 15:15:27 +03:00
feld 9b740cfb23 Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default

Closes #1596

See merge request pleroma/pleroma!2267
2020-03-04 18:22:37 +00:00
Mark Felder 05da5f5cca Update Copyrights 2020-03-03 16:44:49 -06:00
eugenijm 7af431c150 Exclude reblogs from `GET /api/pleroma/admin/statuses` by default 2020-03-02 16:47:31 +03:00
Haelwenn (lanodan) Monnier 6da6540036
Bump copyright years of files changed after 2020-01-07
Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
2020-03-02 06:08:45 +01:00
feld f2216287a7 Merge branch 'admin-status-list' into 'develop'
Admin API: `/api/pleroma/admin/statuses` (accepts `godmode` and `local_only`)

Closes #1550

See merge request pleroma/pleroma!2192
2020-02-27 18:11:04 +00:00
eugenijm 4ab07cf0d5 Admin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/statuses` and `GET /api/pleroma/admin/instance/:instance/statuses` 2020-02-26 22:35:57 +03:00
eugenijm e2a6a40367 Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts `godmode` and `local_only`) 2020-02-26 20:21:38 +03:00
Egor Kislitsyn 22018adae6
Fix Dialyzer warnings 2020-02-25 18:34:56 +04:00
eugenijm 7ad5c51f23 Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope 2020-02-24 21:46:37 +03:00
Alexander Strizhakov dad23e3766
need_reboot flag 2020-02-08 13:00:02 +03:00
Alexander Strizhakov c85aa6e87f
removing confusing error 2020-02-06 12:50:36 +03:00
Alexander Strizhakov 5db6ac8ee4
removing migrate_from_db endpoint from admin api 2020-02-05 20:36:21 +03:00
Alexander Strizhakov e93cc561cd
restarting pleroma from outside application 2020-01-25 18:42:04 +03:00
Alexander Strizhakov d5f8a88a37
support for updating env after settings deletion 2020-01-22 15:14:11 +03:00
Alexander Strizhakov f01ab6cd29
some refactor and tests 2020-01-21 18:42:00 +03:00
Alexander Strizhakov 503d966e9f
Merge branch 'develop' into admin-be 2020-01-21 10:32:27 +03:00
Alexander Strizhakov dcae5914d1
fix for db key 2020-01-21 10:14:48 +03:00
Alexander Strizhakov 8023fa48db
merge fix 2020-01-20 18:25:00 +03:00
lain 6a716e3fe5 Merge branch 'credo/version-bump-1.1.5' into 'develop'
Bump credo to 1.1.5

See merge request pleroma/pleroma!2115
2020-01-20 14:42:43 +00:00
lain c814f22030 Merge branch 'fix-admin-api-scope' into 'develop'
fix oauth scopes for AdminApi#reports_update

See merge request pleroma/pleroma!2087
2020-01-20 12:07:12 +00:00
Haelwenn (lanodan) Monnier 5c533e10e7
Bump credo to 1.1.5 2020-01-20 12:17:14 +01:00
Alexander Strizhakov e699861690
full update for some subkeys 2020-01-18 12:25:56 +03:00
Alexander Strizhakov 89e93fb33f
return db key on update requests 2020-01-17 18:15:41 +03:00
Alexander Strizhakov 60ba2339a2
saving to DB only added by user settings 2020-01-17 11:45:44 +03:00
Alexander Strizhakov 29155137fd
renaming
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
2020-01-16 08:50:27 +03:00
Alexander Strizhakov 59ba5c80b9
little cleanup 2020-01-15 17:10:33 +03:00
Ivan Tashkinov 76c1948880 [#1478] Adjusted AdminAPIController admin subscope requirements. 2020-01-15 12:11:23 +03:00
Alexander Strizhakov 1630ecaa20
Merge branch 'develop' into admin-be 2020-01-11 12:15:42 +03:00
Alexander Strizhakov d933fd3d61
more renamings 2020-01-10 19:51:32 +03:00
Alexander Strizhakov 7d128ca208
dynamic_configuration renaming
and moving it from instance settings
2020-01-10 19:34:19 +03:00
Alexander Strizhakov 958d0452e4
fix for pleroma assets group update 2020-01-10 18:18:09 +03:00
Alexander Strizhakov 88a16bb9fc
deep merge in config update 2020-01-10 15:52:02 +03:00
Alexander c841174de8
flag for delete fix 2020-01-10 15:52:02 +03:00
Alexander 0b02040327
little fixes and typos fix 2020-01-10 15:52:02 +03:00
Alexander 9c1f3bfeff
fixes for logger backends 2020-01-10 15:52:01 +03:00
Alexander 063ab6d911
logger backends fix 2020-01-10 15:52:01 +03:00
Alexander 583cee4607
parsing proxy url setting 2020-01-10 15:52:01 +03:00
Alexander fea734ca70
errors on endpoints 2020-01-10 15:52:00 +03:00
Alexander 5cacb988b9
partially settings update 2020-01-10 15:52:00 +03:00
Alex S 2753285b77
config editing through database 2020-01-10 15:51:59 +03:00
Maksim Pechnikov 385356aad0 fix oauth scopes for AdminApi#reports_update 2019-12-24 20:51:52 +03:00
lain 8cb852523a Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'
AdminAPI: Merge account views for list instance statuses

See merge request pleroma/pleroma!2054
2019-12-12 09:28:27 +00:00
Maxim Filippov 3ecf131511 Merge branch 'develop' into feature/report-notes 2019-12-12 02:16:23 +03:00
Maxim Filippov 82fae3e23f AdminAPI: Merge account views for list instance statuses 2019-12-11 18:57:36 +03:00
Ivan Tashkinov 835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
# Conflicts:
#	CHANGELOG.md
2019-12-10 08:55:14 +03:00
Maxim Filippov a7f77785c2 Implement report notes destruction 2019-12-08 11:27:23 +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
Maxim Filippov 4b60d41db9 Add report notes 2019-12-04 00:26:37 +09:00
Ivan Tashkinov 51111e286b [#1427] Initial support for OAuth admin scopes. 2019-11-29 18:57:19 +03: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 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 40059c9b1e Typo 2019-11-25 00:05:52 +09:00
Maxim Filippov 2b341627da Admin API: Render whole status in grouped reports 2019-11-25 00:04:29 +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
Maxim Filippov b14bf9044f Merge branch 'develop' into feature/reports-groups-and-multiple-state-update 2019-11-08 18:30:49 +09:00
Maxim Filippov 7258db023e Support old flag format 2019-11-08 18:21:29 +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
lain 556da92902 Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'
Store status data inside flag activity

See merge request pleroma/pleroma!1849
2019-11-04 14:11:44 +00:00
Maxim Filippov 743b622b7b Force password reset for multiple users 2019-11-01 18:45:47 +03:00
Maxim Filippov d75934b0d0 Undo dialyzer fix 2019-11-01 15:14:43 +03:00
Maxim Filippov ced9f92327 Fix count 2019-10-31 15:34:49 +03:00
Maxim Filippov 6f9d3d30fa AdminAPI: Omit relay user from users list 2019-10-31 02:26:02 +03:00
Maxim Filippov 59a149c69a Fix "the call ... will never return" warning 2019-10-31 02:25:15 +03:00
Maxim Filippov d56bc62275 Fix report parsing 2019-10-27 16:33:58 +03:00
Maxim Filippov 791bcfd90f Merge branch 'develop' into feature/store-statuses-data-inside-flag 2019-10-27 16:11:25 +03:00
Maxim Filippov b08b1d5d91 Store status data inside Flag activity 2019-10-23 21:27:22 +02:00
Ivan Tashkinov ee04fbc35a [#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.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 22:29:56 +03: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 35068baf65 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update 2019-10-07 15:41:41 +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
Ivan Tashkinov 64095961fe [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex
2019-10-02 20:42:40 +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
kaniini a39e065916 Merge branch 'feature/return-link-for-password-reset' into 'develop'
Admin API: Return link alongside with token on password reset

See merge request pleroma/pleroma!1691
2019-09-26 03:12:03 +00:00
kaniini 48a82c4609 Merge branch 'refactor/user' into 'develop'
Simplify updating user's `info`

See merge request pleroma/pleroma!1712
2019-09-26 03:00:38 +00:00
Maxim Filippov 60cbea5bb2 Allow activities pagination via limit/offset 2019-09-25 01:25:42 +03:00
Egor Kislitsyn 209395c7e6 Add User.change_info/2 and User.update_info/2 2019-09-24 19:50:07 +07: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
Ivan Tashkinov 6f67aed3ac [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
#	lib/pleroma/web/admin_api/admin_api_controller.ex
2019-09-19 10:59:09 +03:00
Ekaterina Vaartis d51e5e447e Move emoji reloading to admin api 2019-09-19 00:16:33 +03:00
Maxim Filippov 384b7dd40d Fix response 2019-09-18 18:06:49 +03:00
Maxim Filippov f89728ad95 Merge branch 'develop' into feature/return-link-for-password-reset 2019-09-18 16:44:11 +03:00
Ivan Tashkinov 551f2fa59e [#1234] Added changelog entry, removed admin OAuth scopes. 2019-09-18 12:31:33 +03:00
Alex S a18f1e7cd7 namings 2019-09-18 10:49:14 +03:00
Alex S 2263c8b6b9 little fixes 2019-09-18 10:49:14 +03:00
Alex S 4faf2b1555 post for creating invite tokens in admin api 2019-09-18 10:49:14 +03:00
Maxim Filippov f9dd121ad3 Admin API: Return link alongside with token on password reset 2019-09-17 23:09:08 +03:00
Ivan Tashkinov 01c1078015 [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-17 22:53:26 +03:00
Ivan Tashkinov 76068873db [#1234] Defined admin OAuth scopes, refined other scopes. Added tests. 2019-09-17 22:19:39 +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 efbc2edba1 [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub_controller.ex
#	lib/pleroma/web/router.ex
2019-09-15 18:52:27 +03:00
Ivan Tashkinov e6f43a831b [#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes). 2019-09-15 18:22:08 +03:00
Alex S a1f2dfb10a expanding regex sigils to use modifiers 2019-09-11 09:25:33 +03:00
Maxim Filippov 736165c082 Reverse reports list 2019-09-05 16:54:34 +03:00
Maxim Filippov af746fa4a8 Return total for reports 2019-09-04 20:08:13 +03:00
Maxim Filippov 9c96b17e16 Add pagination to logs 2019-09-01 21:23:30 +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 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
Alexander Strizhakov de0f3b73dd Admin fixes 2019-08-03 18:16:09 +00: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 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
Egor Kislitsyn 5104f65b69 Wrap error messages into gettext helpers 2019-07-10 18:10:09 +07:00
feld 93a0eeab16 Add license/copyright to all project files 2019-07-10 05:13:23 +00:00
Maxim Filippov 6c50fbcd14 Admin API: Allow querying user by ID 2019-07-05 19:33:53 +03:00
Eugenij ab50c6b3ca Add fallback value to the admin report view.
This is to avoid 500 error when the reported user no longer exists
in the database.
2019-07-02 01:27:00 +00:00
Maxim Filippov 452ca5250d Merge admin and mastodon user views for reports 2019-06-28 15:15:32 +03:00
Alexander Strizhakov c6705144a2 don't delete config settings on admin update 2019-06-27 04:19:44 +00: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
rinpatch bf6aa6f1a8 Fix report content stopping to be nullable 2019-06-16 13:06:12 +03:00
rinpatch 44de34d170 Credo fixes 2019-06-16 01:35:45 +03:00
rinpatch 641bcaa44e Sanitize HTML in ReportView
Closes #990
2019-06-16 01:30:32 +03: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 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
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
Alexander Strizhakov a2be420f94 differences_in_mastoapi_responses.md: fullname & bio are optionnal
[ci skip]
2019-05-13 18:35:45 +00:00
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
lambda 184ae60b21 Merge branch 'bugfix/pleroma-email-naming' into 'develop'
Make the filename and module name of Pleroma.Emails.* orthogonal

See merge request pleroma/pleroma!1029
2019-04-12 10:41:09 +00:00
Haelwenn (lanodan) Monnier 9c1b36856b
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/ 2019-04-10 06:33:20 +02:00
Haelwenn (lanodan) Monnier 1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/ 2019-04-10 06:33:19 +02:00
Alex S 012bb5dcc9 renaming expire_at -> expires_at
keyword style change
2019-04-08 16:01:28 +07:00
Alex S 56c75aec12 credo fix 2019-04-07 20:59:53 +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 b5a2d384f7 Redundant Repo.get_by usage was recently removed from the codebase 2019-04-05 11:41:41 -05:00
Roger Braun 7895ee37fa Add user following / unfollowing to the admin api. 2019-04-05 11:27:07 -05:00
eugenijm 10c81fc902 Add user show endpoint for Pleroma admin API 2019-03-27 21:44:15 +03:00
Maxim Filippov 3cf7539bca Add more user filters + move search to its own module 2019-03-27 03:51:59 +05:00
kaniini 59333f2d56 Merge branch 'admin-api-account-view-namespace' into 'develop'
MastodonAPI.Admin.AccountView → AdminAPI.AccountView

See merge request pleroma/pleroma!930
2019-03-14 02:01:10 +00:00
Haelwenn (lanodan) Monnier cc0f2f8ba3
MastodonAPI.Admin.AccountView → AdminAPI.AccountView 2019-03-13 12:17:57 +01:00
Maxim Filippov 2d30fc279f Typo 2019-03-05 02:11:15 +03:00
Maxim Filippov f620199836 Merge search endpoint into /users 2019-03-04 21:26:32 +03:00
Maxim Filippov 2ec8cf5665 Add pagination to search 2019-03-02 17:21:30 +03:00
Maxim Filippov f635b675b2 Refactor a little bit 2019-03-01 21:17:23 +03:00
Maxim Filippov f1a4c3163b Show current user in users list as well 2019-03-01 20:23:03 +03:00
Maxim Filippov 5b08b470f6 Add "local" params to users search 2019-03-01 20:13:02 +03:00
Maxim Filippov 46f29b9da1 Add search users endpoint 2019-02-28 19:04:47 +03:00
Maxim Filippov 72b7a0797e Use Mastodon API views in Admin API 2019-02-28 17:43:09 +03:00
Maxim Filippov 2883f75a3a Add pagination to users admin API 2019-02-28 01:11:56 +03:00
Maxim Filippov 90d0d055fc Add more admin actions 2019-02-27 00:13:38 +03:00
eugenijm 25b9e7a8c3 Added admin API for changing user activation status 2019-02-19 19:37:02 +03:00
lambda 32541172cd Merge branch 'cleanup/admin-api-useless-if' into 'develop'
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete

See merge request pleroma/pleroma!612
2019-01-01 13:48:59 +00:00
Haelwenn (lanodan) Monnier 1e6c102bfc
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete 2018-12-31 19:50:14 +01:00
William Pitcock 980b5288ed update copyright years to 2019 2018-12-31 15:41:47 +00:00
William Pitcock 2791ce9a1f add license boilerplate to pleroma core 2018-12-23 20:56:42 +00:00
Ivan Tashkinov b86057cc7f [#114] Refactored User.register_changeset to init confirmation data.
Introduced User.register/1 to encapsulate User record creation and post-registration actions.
2018-12-18 17:22:42 +03:00
Ivan Tashkinov a89e3b4b60 [#114] Moved email_invite action to AdminAPIController, adjusted tests. 2018-12-14 12:28:23 +03:00
Maksim Pechnikov e94c3442f4 updates 2018-12-10 13:27:37 +03:00
Maksim Pechnikov 074fa790ba fix compile warnings 2018-12-09 20:50:08 +03:00
Ivan Tashkinov 7b19487389 [#394] Added `users.tags` and admin routes to tag and untag users. Added tests. 2018-12-06 20:06:50 +03:00
lain 1c67277c80 Fix admin api. 2018-12-01 09:03:16 +01:00
Haelwenn (lanodan) Monnier 0ca00b3a07
Web.AdminAPI.AdminAPIController: Fixes bugs found with ExUnit 2018-11-17 22:12:14 +01:00
Haelwenn (lanodan) Monnier 12ccf0c4f8
Change Relay from `status` to `{status, message}` 2018-11-17 22:12:13 +01:00
Haelwenn (lanodan) Monnier e0b0fde713
Web.AdminAPI.AdminAPIController: Change right to permission group (except for function names) 2018-11-17 20:25:57 +01:00
Haelwenn (lanodan) Monnier ccd6b1956d
lib/pleroma/web/admin_api/admin_api_controller.ex: Support status reply of Relay.{un,}follow 2018-11-17 20:25:56 +01:00
Haelwenn (lanodan) Monnier f9d05902fe
lib/pleroma/web/admin_api/admin_api_controller.ex: An admin cannot un-admin themselves 2018-11-17 20:25:56 +01:00
Haelwenn (lanodan) Monnier a87ed2fad6
Pleroma.Web.AdminAPI.AdminAPIController: user_create statement format 2018-11-17 20:25:55 +01:00
Haelwenn (lanodan) Monnier f48062488e
Add get endpoints for rights [AdminAPI] 2018-11-17 20:25:55 +01:00
Haelwenn (lanodan) Monnier 59ce7fedce
Fix connection returns make generic right endpoint [AdminAPI] 2018-11-17 20:25:55 +01:00
Haelwenn (lanodan) Monnier c5a2bd6a65
admin_api_controller.ex: fix remaining params at once 2018-11-17 20:25:54 +01:00
Haelwenn (lanodan) Monnier 95b107b6cc
admin_api_controller.ex: Add documentation, fix get_invite_token 2018-11-17 20:25:54 +01:00
Haelwenn (lanodan) Monnier 578a911737
admin_api_controller.ex: get_password_reset: fix params and response 2018-11-17 20:25:54 +01:00
Haelwenn (lanodan) Monnier 5732eef16b
lib/pleroma/web/admin_api/admin_api_controller.ex: Pleroma.Web.AdminAPI.Controller → Pleroma.Web.AdminAPI.AdminAPIController 2018-11-17 20:25:53 +01:00
Haelwenn (lanodan) Monnier 77d2fd54dd
admin_api_controller: Have some basic code 2018-11-17 20:25:52 +01:00