31 commits

Author	SHA1	Message	Date
Maxim Filippov	f171095960	Grouped reports with status data baked in	2019-11-06 21:25:46 +10:00
Maxim Filippov	43ea16870f	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-11-05 02:12:48 +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
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	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
Egor Kislitsyn	e7aef27c00	Fix merge	2019-09-30 19:10:54 +07:00
Maxim Filippov	e7836adf21	Merge branch 'develop' into feature/moderation-log-filters	2019-09-26 19:01:54 +03:00
Steven Fuchs	e1d2d69c87	Clean up views	2019-09-23 22:33:59 +00: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	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	846ad9a463	admin api configure changes	2019-07-11 13:02:13 +00:00
feld	93a0eeab16	Add license/copyright to all project files	2019-07-10 05:13:23 +00: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
Alex S	982cad0268	support for config groups	2019-06-23 08:16:16 +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
Alex S	012bb5dcc9	renaming expire_at -> expires_at ... keyword style change	2019-04-08 16:01:28 +07:00
Alex S	dcc54f8cfa	admin api endpoints for invites	2019-04-06 20:25:19 +07: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