| 
								
								
									 lain | c3f1ce80eb | Merge branch 'fix/1726-user-pagination' into 'develop' Pagination fix for service users filters in admin api
Closes #1726
See merge request pleroma/pleroma!2452 | 2020-05-06 09:01:42 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | e7d8ab8303 | admin_api fetch status by id | 2020-05-05 16:18:56 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | ecf37b46d2 | pagination fix for service users filters | 2020-05-01 14:31:24 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 908cf22a6c | Merge remote-tracking branch 'remotes/origin/develop' into automatic-authentication-and-instance-publicity-checks # Conflicts:
#	lib/pleroma/web/mastodon_api/controllers/account_controller.ex | 2020-04-28 19:56:20 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 0d05e1fe39 | [#1706] Prevented error on unresolved activity actors for timeline actions. | 2020-04-25 18:24:10 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | f685cbd309 | Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring. | 2020-04-21 16:29:19 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn | a17bfb5fab | Merge branch 'feature/1584-client-captcha-options' into 'develop' Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252 | 2020-04-17 09:19:35 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 72ef6cc4f2 | added need_reboot endpoint to admin api | 2020-04-16 16:03:26 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | a21baf89d8 | Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses | 2020-04-13 09:16:51 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | f20a19de85 | typo fix | 2020-04-09 13:28:54 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 1cf0d5ab0d | Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex | 2020-04-09 10:17:36 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 4c60fdcbb1 | Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex | 2020-04-09 10:17:31 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 2d64500a9d | error improvement for email_invite endpoint | 2020-04-01 20:26:33 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 2f2bd7fe72 | Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance. See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param. | 2020-04-01 19:49:09 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | b607ae1a1c | removing grouped reports admin api endpoint | 2020-03-30 13:51:45 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | a6ee6784bc | creating trusted app from adminFE & mix task | 2020-03-23 10:44:47 +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 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 8176ca9e40 | static_fe: Sanitize HTML in users | 2020-03-15 20:44:04 +01: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 | 282a93554f | merging release default config on app start | 2020-03-11 16:25:53 +03:00 |  | 
				
					
						| 
								
								
									 eugenijm | ad22e94f33 | Exclude private and direct statuses visible to the admin when using godmode | 2020-03-05 15:15:27 +03:00 |  | 
				
					
						| 
								
								
									 feld | 9b740cfb23 | Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop' Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
Closes #1596
See merge request pleroma/pleroma!2267 | 2020-03-04 18:22:37 +00:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 05da5f5cca | Update Copyrights | 2020-03-03 16:44:49 -06:00 |  | 
				
					
						| 
								
								
									 eugenijm | 7af431c150 | Exclude reblogs from GET /api/pleroma/admin/statusesby default | 2020-03-02 16:47:31 +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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 22018adae6 | Fix Dialyzer warnings | 2020-02-25 18:34:56 +04: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 | 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 | f01ab6cd29 | some refactor and tests | 2020-01-21 18:42:00 +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 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 8023fa48db | merge fix | 2020-01-20 18:25:00 +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 | 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 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 76c1948880 | [#1478] Adjusted AdminAPIController admin subscope requirements. | 2020-01-15 12:11:23 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 1630ecaa20 | Merge branch 'develop' into admin-be | 2020-01-11 12:15:42 +03:00 |  |