6 Commits (1a6e30d32ef17e5791de404e5cebb37844264dcb)

Author	SHA1	Message	Date
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
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
Maxim Filippov	ad42837244	Ability to toggle activation status and permission group for a group of users	5 years ago
Maxim Filippov	f182f0f6bd	Add ability to search moderation logs	5 years ago
Maxim Filippov	37dd3867bb	Log admin/moderator actions	5 years ago