10 commits

Author	SHA1	Message	Date
Mark Felder	28581e03ad	Merge branch 'develop' into refactor/deactivated_user_field	2021-01-18 14:58:21 -06:00
Mark Felder	44a86951a3	Merge branch 'develop' into refactor/approval_pending_user_field	2021-01-18 12:05:05 -06:00
Mark Felder	d36182c088	Change user.confirmation_pending field to user.is_confirmed	2021-01-15 12:44:41 -06:00
Mark Felder	ebd7d1365b	Make setting user activation status explicit	2021-01-15 11:37:17 -06:00
Mark Felder	860b5c7804	Change user.deactivated field to user.is_active	2021-01-15 11:24:46 -06:00
Mark Felder	f7e59c28ed	Change user.approval_pending field to user.is_approved	2021-01-15 10:42:02 -06:00
Haelwenn (lanodan) Monnier	c4439c630f	Bump Copyright to 2021 ... grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'	2021-01-13 07:49:50 +01:00
Alex Gleason	20af025c65	AdminAPI: return user email	2021-01-06 11:30:32 -06:00
Egor Kislitsyn	1a98476f48	Remove unused aliases	2020-10-30 18:42:43 +04:00
Maksim Pechnikov	ef627b9391	fix module name	2020-10-22 12:04:23 +03:00

Renamed from test/web/admin_api/controllers/user_controller_test.exs (Browse further)