| 
								
								
									 Alexander Strizhakov | a050f3e015 | fix for logger configuration through admin-fe | 2020-04-13 08:56:28 +03:00 |  | 
				
					
						| 
								
								
									 lain | b87b798ca1 | Merge branch 'fix/1658-invite-send' into 'develop' Error improvement for email_invite endpoint
See merge request pleroma/pleroma!2344 | 2020-04-09 10:42:43 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 9795ff5b01 | Apply suggestion to test/web/admin_api/admin_api_controller_test.exs | 2020-04-09 10:17:50 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 365c34a7a9 | Apply suggestion to test/web/admin_api/admin_api_controller_test.exs | 2020-04-09 10:17:44 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 2d64500a9d | error improvement for email_invite endpoint | 2020-04-01 20:26:33 +03:00 |  | 
				
					
						| 
								
								
									 feld | ef7d2b0f11 | Merge branch 'gun' into 'develop' Gun adapter
Closes #945
See merge request pleroma/pleroma!1861 | 2020-04-01 17:05:09 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | b607ae1a1c | removing grouped reports admin api endpoint | 2020-03-30 13:51:45 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | f497cf2f7c | Merge branch 'develop' into gun | 2020-03-30 12:15:23 +03:00 |  | 
				
					
						| 
								
								
									 lain | 1d75d0ed7a | 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-24 17:34:13 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 9bae9b1b1b | Merge branch 'develop' into gun | 2020-03-20 20:47:54 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 1c05f539aa | Improved in-test clear_config/napplicability (setup / setup_all / in-test usage). | 2020-03-20 18:33:00 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | ec3719f539 | Improved in-test config management functions. | 2020-03-18 20:30:31 +03:00 |  | 
				
					
						| 
								
								
									 eugenijm | 13cce9c0de | Admin API: PATCH /api/pleroma/admin/users/:nickname/credentials,GET /api/pleroma/admin/users/:nickname/credentials. | 2020-03-16 20:42:37 +03:00 |  | 
				
					
						| 
								
								
									 eugenijm | d198e7fa2a | Admin API: PATCH /api/pleroma/admin/users/:nickname/change_password | 2020-03-16 20:32:07 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | f0651730bd | Merge branch 'develop' into gun | 2020-03-16 14:25:55 +03:00 |  | 
				
					
						| 
								
								
									 feld | 802b991814 | Merge branch 'exclude-posts-visible-to-admin' into 'develop' Exclude private and direct statuses visible to the admin when using godmode
Closes #1599
See merge request pleroma/pleroma!2272 | 2020-03-12 20:29:51 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 426f5ee48a | tesla adapter can't be changed in adminFE | 2020-03-10 15:31:44 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | b2eb1124d1 | Merge branch 'develop' into gun | 2020-03-07 12:41:37 +03:00 |  | 
				
					
						| 
								
								
									 eugenijm | ad22e94f33 | Exclude private and direct statuses visible to the admin when using godmode | 2020-03-05 15:15:27 +03:00 |  | 
				
					
						| 
								
								
									 lain | f1750b4658 | Admin API tests: Fix wrong test. | 2020-03-05 12:42:02 +01:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 4427161ca3 | Merge branch 'develop' into gun | 2020-03-03 17:15:49 -06:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 05da5f5cca | Update Copyrights | 2020-03-03 16:44:49 -06:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 509c81e4b1 | Merge branch 'develop' into gun | 2020-03-03 10:08:07 +03: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 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 814b275af7 | Merge branch 'develop' into gun | 2020-02-29 11:34:50 +03: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 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 13918cb545 | Merge branch 'develop' into gun | 2020-02-21 10:02:37 +03:00 |  | 
				
					
						| 
								
								
									 Mark Felder | cf94349287 | Merge branch 'develop' into gun | 2020-02-18 09:06:27 -06: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 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 514c899275 | adding gun adapter | 2020-02-18 08:19:01 +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 |  |