178 commits

Author	SHA1	Message	Date
Alexander Strizhakov	8023fa48db	merge fix	2020-01-20 18:25:00 +03:00
Alexander Strizhakov	e699861690	full update for some subkeys	2020-01-18 12:25:56 +03:00
Alexander Strizhakov	89e93fb33f	return db key on update requests	2020-01-17 18:15:41 +03:00
Alexander Strizhakov	60ba2339a2	saving to DB only added by user settings	2020-01-17 11:45:44 +03:00
Alexander Strizhakov	29155137fd	renaming ... Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB	2020-01-16 08:50:27 +03:00
Alexander Strizhakov	59ba5c80b9	little cleanup	2020-01-15 17:10:33 +03:00
Alexander Strizhakov	1630ecaa20	Merge branch 'develop' into admin-be	2020-01-11 12:15:42 +03:00
Alexander Strizhakov	d933fd3d61	more renamings	2020-01-10 19:51:32 +03:00
Alexander Strizhakov	7d128ca208	dynamic_configuration renaming ... and moving it from instance settings	2020-01-10 19:34:19 +03:00
Alexander Strizhakov	958d0452e4	fix for pleroma assets group update	2020-01-10 18:18:09 +03:00
Alexander Strizhakov	88a16bb9fc	deep merge in config update	2020-01-10 15:52:02 +03:00
Alexander	c841174de8	flag for delete fix	2020-01-10 15:52:02 +03:00
Alexander	0b02040327	little fixes and typos fix	2020-01-10 15:52:02 +03:00
Alexander	9c1f3bfeff	fixes for logger backends	2020-01-10 15:52:01 +03:00
Alexander	063ab6d911	logger backends fix	2020-01-10 15:52:01 +03:00
Alexander	583cee4607	parsing proxy url setting	2020-01-10 15:52:01 +03:00
Alexander	fea734ca70	errors on endpoints	2020-01-10 15:52:00 +03:00
Alexander	5cacb988b9	partially settings update	2020-01-10 15:52:00 +03:00
Alex S	2753285b77	config editing through database	2020-01-10 15:51:59 +03:00
lain	8cb852523a	Merge branch 'feature/merge-acc-views-for-statuses' into 'develop' ... AdminAPI: Merge account views for list instance statuses See merge request pleroma/pleroma!2054	2019-12-12 09:28:27 +00:00
Maxim Filippov	3ecf131511	Merge branch 'develop' into feature/report-notes	2019-12-12 02:16:23 +03:00
Maxim Filippov	82fae3e23f	AdminAPI: Merge account views for list instance statuses	2019-12-11 18:57:36 +03:00
Ivan Tashkinov	835ac2157c	Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes ... # Conflicts: # CHANGELOG.md	2019-12-10 08:55:14 +03:00
Maxim Filippov	a7f77785c2	Implement report notes destruction	2019-12-08 11:27:23 +03:00
Ivan Tashkinov	40e1817f70	[#1427] Fixes / improvements of admin scopes support. Added tests.	2019-12-06 20:33:47 +03:00
Maxim Filippov	08c89fd2b8	Fix incorrect report count	2019-12-06 17:17:24 +09:00
Ivan Tashkinov	13926537b6	Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes	2019-12-06 00:26:31 +03:00
Ivan Tashkinov	af42c00cff	[#1427] Reworked admin scopes support. ... Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).	2019-12-06 00:25:44 +03:00
Maxim Filippov	4b60d41db9	Add report notes	2019-12-04 00:26:37 +09:00
Ivan Tashkinov	51111e286b	[#1427] Initial support for OAuth admin scopes.	2019-11-29 18:57:19 +03:00
Maxim Filippov	fcabcab443	Fetch account from report, not from status (it might be deleted)	2019-11-28 00:09:00 +09:00
Maxim Filippov	5135656f57	Handle reopened reports with deleted statuses	2019-11-27 22:54:12 +09:00
Maxim Filippov	b62be2564c	Merge branch 'develop' into feature/admin-api-render-whole-status	2019-11-26 00:25:43 +09:00
Maxim Filippov	82f4e4760e	Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance	2019-11-25 01:46:18 +09:00
Maxim Filippov	40059c9b1e	Typo	2019-11-25 00:05:52 +09:00
Maxim Filippov	2b341627da	Admin API: Render whole status in grouped reports	2019-11-25 00:04:29 +09:00
Maxim Filippov	46eb160135	AdminAPI: Confirm user account, resend confirmation email	2019-11-19 20:14:02 +09:00
Maxim Filippov	114930b5fd	Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance	2019-11-14 23:45:29 +09:00
Maxim Filippov	30af5da330	Admin API: list all statuses from a given instance	2019-11-14 23:44:07 +09:00
Maxim Filippov	b14bf9044f	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-11-08 18:30:49 +09:00
Maxim Filippov	7258db023e	Support old flag format	2019-11-08 18:21:29 +09:00
Maxim Filippov	f171095960	Grouped reports with status data baked in	2019-11-06 21:25:46 +10:00
Maxim Filippov	2cbfa256fd	Merge branch 'develop' into feature/multiple-users-force-password-reset	2019-11-05 11:36:47 +10:00
Maxim Filippov	43ea16870f	Merge branch 'develop' into feature/reports-groups-and-multiple-state-update	2019-11-05 02:12:48 +03:00
lain	556da92902	Merge branch 'feature/store-statuses-data-inside-flag' into 'develop' ... Store status data inside flag activity See merge request pleroma/pleroma!1849	2019-11-04 14:11:44 +00:00
Maxim Filippov	743b622b7b	Force password reset for multiple users	2019-11-01 18:45:47 +03:00
Maxim Filippov	d75934b0d0	Undo dialyzer fix	2019-11-01 15:14:43 +03:00
Maxim Filippov	ced9f92327	Fix count	2019-10-31 15:34:49 +03:00
Maxim Filippov	6f9d3d30fa	AdminAPI: Omit relay user from users list	2019-10-31 02:26:02 +03:00
Maxim Filippov	59a149c69a	Fix "the call ... will never return" warning	2019-10-31 02:25:15 +03:00