12 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	d36182c088	Change user.confirmation_pending field to user.is_confirmed	2021-01-15 12:44:41 -06:00
Mark Felder	860b5c7804	Change user.deactivated field to user.is_active	2021-01-15 11:24:46 -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	cbce880076	Merge remote-tracking branch 'upstream/develop' into aliases	2020-12-30 17:10:02 -06:00
Egor Kislitsyn	35ba48494f	Stream follow updates	2020-12-02 00:18:58 +04:00
lain	dd2b3a8da9	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes	2020-11-04 16:51:42 +01:00
Alex Gleason	83770b7b39	Merge remote-tracking branch 'upstream/develop' into aliases	2020-10-14 12:33:24 -05:00
Mark Felder	ed61002815	Undo API breaking changes	2020-10-14 11:03:17 -05:00
Alex Gleason	7d8f610720	Merge remote-tracking branch 'upstream/develop' into aliases	2020-10-13 19:25:18 -05:00
Mark Felder	409f694e4f	Merge branch 'develop' into refactor/locked_user_field	2020-10-13 09:54:29 -05:00
Alexander Strizhakov	7dffaef479	tests consistency	2020-10-13 16:35:09 +03:00

Renamed from test/web/mastodon_api/views/account_view_test.exs (Browse further)