| 
								
								
									 Haelwenn | fb9ec885cc | Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop' Added need_reboot endpoint to admin api
Closes #1677
See merge request pleroma/pleroma!2373 | 2020-05-01 01:38:25 +03:00 |  | 
				
					
						| 
								
								
									 lain | c4d3ccc7b9 | Merge branch 'admin-api-change-password' into 'develop' Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149 | 2020-03-31 13:41:47 +03:00 |  | 
				
					
						| 
								
								
									 lain | f1750b4658 | Admin API tests: Fix wrong test. | 2020-03-05 12:42:02 +01:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 05da5f5cca | Update Copyrights | 2020-03-03 16:44:49 -06:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 6da6540036 | Bump copyright years of files changed after 2020-01-07 Done via the following command:
git diff fcd5dd259a--stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>' | 2020-03-02 06:08:45 +01:00 |  | 
				
					
						| 
								
								
									 feld | f2216287a7 | Merge branch 'admin-status-list' into 'develop' Admin API: `/api/pleroma/admin/statuses` (accepts `godmode` and `local_only`)
Closes #1550
See merge request pleroma/pleroma!2192 | 2020-02-27 18:11:04 +00:00 |  | 
				
					
						| 
								
								
									 eugenijm | 4ab07cf0d5 | Admin API: Exclude boosts from GET /api/pleroma/admin/users/:nickname/statusesandGET /api/pleroma/admin/instance/:instance/statuses | 2020-02-26 22:35:57 +03:00 |  | 
				
					
						| 
								
								
									 eugenijm | e2a6a40367 | Admin API: GET /api/pleroma/admin/statuses- list all statuses (acceptsgodmodeandlocal_only) | 2020-02-26 20:21:38 +03:00 |  | 
				
					
						| 
								
								
									 eugenijm | 7ad5c51f23 | Admin API: GET /api/pleroma/admin/statsto get status count by visibility scope | 2020-02-24 21:46:37 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 226f4d5ef9 | Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks # Conflicts:
#	test/web/admin_api/admin_api_controller_test.exs | 2020-02-18 17:52:31 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 4f8c3462a8 | Tweaks to clear_configcalls in tests in order to prevent side effects on config during test suite execution. | 2020-02-13 21:55:47 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | dad23e3766 | need_reboot flag | 2020-02-08 13:00:02 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | c85aa6e87f | removing confusing error | 2020-02-06 12:50:36 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 5db6ac8ee4 | removing migrate_from_db endpoint from admin api | 2020-02-05 20:36:21 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | e93cc561cd | restarting pleroma from outside application | 2020-01-25 18:42:04 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | d5f8a88a37 | support for updating env after settings deletion | 2020-01-22 15:14:11 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 503d966e9f | Merge branch 'develop' into admin-be | 2020-01-21 10:32:27 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | dcae5914d1 | fix for db key | 2020-01-21 10:14:48 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | ca3b4de2c9 | [#1521] AdminApiControllerTest: fixed create report test (OAuth). | 2020-01-20 20:04:25 +03:00 |  | 
				
					
						| 
								
								
									 lain | 6a716e3fe5 | Merge branch 'credo/version-bump-1.1.5' into 'develop' Bump credo to 1.1.5
See merge request pleroma/pleroma!2115 | 2020-01-20 14:42:43 +00:00 |  | 
				
					
						| 
								
								
									 lain | c814f22030 | Merge branch 'fix-admin-api-scope' into 'develop' fix oauth scopes for AdminApi#reports_update
See merge request pleroma/pleroma!2087 | 2020-01-20 12:07:12 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 5c533e10e7 | Bump credo to 1.1.5 | 2020-01-20 12:17:14 +01:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | efb8ef5abe | releases support | 2020-01-18 17:14:50 +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 | 7676ed8239 | some clean up | 2020-01-17 16:28:44 +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 | 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 |  | 
				
					
						| 
								
								
									 Alexander | 0656816c77 | tests for setttings without an explicit key | 2020-01-10 15:51:59 +03:00 |  | 
				
					
						| 
								
								
									 Alex S | 2753285b77 | config editing through database | 2020-01-10 15:51:59 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 385356aad0 | fix oauth scopes for AdminApi#reports_update | 2019-12-24 20:51:52 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 7973cbdb9f | OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage. | 2019-12-15 22:32:42 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | 3ecf131511 | Merge branch 'develop' into feature/report-notes | 2019-12-12 02:16:23 +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 | 1770602747 | [#1427] Extra check that admin OAuth scope is used by admin. Adjusted tests. | 2019-12-07 17:49:53 +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 |  |