192 commits

Author	SHA1	Message	Date
Alexander Strizhakov	bfeb33e951	Merge develop ... Merge conflict in lib/pleroma/activity.ex	2019-05-08 14:34:36 +00:00
Egor	b9cdf6d3b9	Use User.get_cached* everywhere	2019-04-22 07:20:43 +00:00
Alex S	c5d0fffeaf	naming fix	2019-04-13 14:55:42 +07:00
Alex S	fe511a6c65	Merge branch 'develop' into feature/788-separate-email-addresses	2019-04-10 18:06:54 +07:00
Alex S	fe13a1d78c	adding notify_email setting for trigger emails	2019-04-10 17:57:41 +07:00
Ivan Tashkinov	44829d9181	AdminApiControllerTest unused variables fix.	2019-04-08 12:32:55 +03:00
Alex S	012bb5dcc9	renaming expire_at -> expires_at ... keyword style change	2019-04-08 16:01:28 +07:00
Alex S	b810aac117	added docs to docs/api/admin_api.md ... code style and little renamings	2019-04-07 19:48:52 +07:00
Alex S	dcc54f8cfa	admin api endpoints for invites	2019-04-06 20:25:19 +07:00
Mark Felder	fac76bfa35	We actually want the user id not nickname in the test...	2019-04-05 12:11:19 -05:00
Mark Felder	c746087f57	Also remove Repo functions in the tests	2019-04-05 11:59:56 -05:00
Roger Braun	7895ee37fa	Add user following / unfollowing to the admin api.	2019-04-05 11:27:07 -05:00
Egor Kislitsyn	1b3d921921	change Repo.get(User, id) => User.get_by_id(id)	2019-04-02 17:01:26 +07:00
eugenijm	10c81fc902	Add user show endpoint for Pleroma admin API	2019-03-27 21:44:15 +03:00
Maxim Filippov	3cf7539bca	Add more user filters + move search to its own module	2019-03-27 03:51:59 +05:00
Maxim Filippov	76a13bc5a2	Fix test	2019-03-17 13:29:28 +03:00
Maxim Filippov	257d8e78e5	Add tags	2019-03-14 01:52:24 +03:00
Maxim Filippov	4872914d32	Add test when local is false	2019-03-13 17:56:15 +03:00
Maxim Filippov	d5edff6ce6	Fix test	2019-03-13 16:14:31 +03:00
Maxim Filippov	490d9cf7b1	Add "local" to users admin API	2019-03-13 16:04:44 +03:00
Maxim Filippov	25eb6cf1cb	Add "roles" to users admin API	2019-03-12 22:15:28 +03:00
Maxim Filippov	e34710b988	Format & update docs	2019-03-04 21:33:53 +03:00
Maxim Filippov	f620199836	Merge search endpoint into /users	2019-03-04 21:26:32 +03:00
Maxim Filippov	2ec8cf5665	Add pagination to search	2019-03-02 17:21:30 +03:00
Maxim Filippov	f384a9a256	Format	2019-03-01 20:23:19 +03:00
Maxim Filippov	f1a4c3163b	Show current user in users list as well	2019-03-01 20:23:03 +03:00
Maxim Filippov	5b08b470f6	Add "local" params to users search	2019-03-01 20:13:02 +03:00
Maxim Filippov	46f29b9da1	Add search users endpoint	2019-02-28 19:04:47 +03:00
Maxim Filippov	70e82a3465	Add test for the second page	2019-02-28 17:54:02 +03:00
Maxim Filippov	2883f75a3a	Add pagination to users admin API	2019-02-28 01:11:56 +03:00
Maxim Filippov	ed7fd6b47e	Add missing docs and tests	2019-02-27 03:08:03 +03:00
eugenijm	25b9e7a8c3	Added admin API for changing user activation status	2019-02-19 19:37:02 +03:00
Haelwenn (lanodan) Monnier	8bb7e19b38	test: de-group alias/es	2019-02-11 03:44:15 +01:00
William Pitcock	3c08d229db	tests: add legal boilerplate	2018-12-23 20:57:10 +00:00
Ivan Tashkinov	07e93f9940	[#114] Improved tests.	2018-12-14 13:52:04 +03:00
Ivan Tashkinov	a89e3b4b60	[#114] Moved email_invite action to AdminAPIController, adjusted tests.	2018-12-14 12:28:23 +03:00
Maksim Pechnikov	89b3729afa	fix warnings	2018-12-12 09:09:19 +03:00
Ivan Tashkinov	6ed5044c4e	[#394] Refactoring (using Ecto.Multi; "untag" route change).	2018-12-07 11:04:39 +03:00
Ivan Tashkinov	22830c8fc9	[#394] Formatting fix.	2018-12-06 20:13:07 +03:00
Ivan Tashkinov	7b19487389	[#394] Added users.tags and admin routes to tag and untag users. Added tests.	2018-12-06 20:06:50 +03:00
lain	1c67277c80	Fix admin api.	2018-12-01 09:03:16 +01:00
Haelwenn (lanodan) Monnier	52681f7fd0	Web.AdminAPI.AdminAPIControllerTest: New Test	2018-11-17 22:12:14 +01:00