28 commits

Author	SHA1	Message	Date
Ivan Tashkinov	e9859b68fc	[#3112] Ensured presence and consistency of :user and :token assigns (EnsureUserTokenAssignsPlug). Refactored auth info dropping functions.	2020-12-06 13:59:10 +03:00
Ivan Tashkinov	e164c37139	[#2301] Proper handling of User.is_discoverable: users appear in in-service search but are hidden from external services like search bots.	2020-11-19 19:30:02 +03:00
lain	bb9650f3c2	FrontendController: Return error on installation error.	2020-11-17 16:43:07 +01:00
Egor Kislitsyn	d26a449396	Change endpoint path	2020-11-11 20:39:57 +04:00
Egor Kislitsyn	435bf1f945	Remove FrontendInstallerWorker	2020-11-11 20:12:35 +04:00
Egor Kislitsyn	08cbd655d1	Merge branch 'develop' into frontend-admin-api	2020-11-11 19:53:40 +04:00
lain	329aa19c9f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain	2020-11-04 15:05:01 +01:00
lain	e46c95b826	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api	2020-11-04 13:23:18 +01:00
Mark Felder	53dd048590	Test the note is returned when fetching a single report	2020-11-02 15:49:07 -06:00
minibikini	6163fbf553	Merge branch 'develop' into 'frontend-admin-api' ... # Conflicts: # lib/pleroma/web/router.ex	2020-11-02 10:43:45 +00:00
Egor Kislitsyn	a2a7a1f2ff	Merge remote-tracking branch 'origin/develop' into feature/account-export	2020-10-31 00:17:33 +04:00
Egor Kislitsyn	d2113428c0	Merge remote-tracking branch 'origin/develop' into feature/account-export	2020-10-30 19:34:02 +04:00
Egor Kislitsyn	1a98476f48	Remove unused aliases	2020-10-30 18:42:43 +04:00
Egor Kislitsyn	d83c2bd330	Add support for install via file and build_url params	2020-10-29 16:37:50 +04:00
Egor Kislitsyn	03e306785b	Add an API endpoint to install a new frontend	2020-10-27 19:20:21 +04:00
Maksim Pechnikov	ef627b9391	fix module name	2020-10-22 12:04:23 +03:00
Maksim Pechnikov	60663150b5	admin user search: added filter by actor_type	2020-10-22 11:53:28 +03:00
Maksim Pechnikov	46b420aa60	need_confirmed -> unconfirmed	2020-10-22 11:50:49 +03:00
Maksim Pechnikov	cf4f393794	added AdminApi.UserController	2020-10-22 11:50:49 +03:00
Maksim Pechnikov	9ef46ce410	added 'unconfirmed' filter to admin/users	2020-10-22 11:50:49 +03:00
Egor Kislitsyn	e87901c424	Merge remote-tracking branch 'origin/develop' into feature/account-export	2020-10-20 17:27:29 +04:00
Egor Kislitsyn	ad605e3e16	Rename Pleroma.Backup to Pleroma.User.Backup	2020-10-20 17:16:58 +04:00
Mark Felder	1fb9452131	Merge branch 'develop' into feature/account-export	2020-10-14 15:27:15 -05:00
Alex Gleason	755f58168b	Merge remote-tracking branch 'upstream/develop' into restrict-domain	2020-10-13 19:26:04 -05:00
Mark Felder	4ead0d564f	Merge branch 'develop' into refactor/discoverable_user_field	2020-10-13 09:54:11 -05:00
Alexander Strizhakov	5f2071c458	changes after rebase	2020-10-13 16:44:03 +03:00
Alexander Strizhakov	7acf09beb8	more tests	2020-10-13 16:38:18 +03:00
Alexander Strizhakov	7dffaef479	tests consistency	2020-10-13 16:35:09 +03:00