lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4b28d812cf
								
							
						 | 
						
							
							
								
								Merge branch 'restricted-relations-embedding' into 'develop'
							
							
							
							
							
							
							
							Restricted support for embedded relationships
See merge request pleroma/pleroma!2456 
							
						 | 
						
							2020-05-17 07:26:51 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								e455ca3f3e
								
							
						 | 
						
							
							
								
								Merge branch 'feature/database-configuration-whitelist' into 'develop'
							
							
							
							
							
							
							
							Database configuration whitelist
See merge request pleroma/pleroma!2522 
							
						 | 
						
							2020-05-14 16:07:37 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Stephanie Wilde-Hobbs
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								20cbfb5cb5
								
							
						 | 
						
							
							
								
								Allow whitelisting whole groups
							
							
							
							
							
						 | 
						
							2020-05-14 12:43:53 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steph
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5c6f575315
								
							
						 | 
						
							
							
								
								Style fixes
							
							
							
							
							
						 | 
						
							2020-05-14 12:15:48 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								fd2fb2bb2e
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/web/mastodon_api/controllers/status_controller.ex
#	lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
#	test/web/mastodon_api/controllers/timeline_controller_test.exs
#	test/web/mastodon_api/views/status_view_test.exs 
							
						 | 
						
							2020-05-13 12:42:36 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								7803a85d2c
								
							
						 | 
						
							
							
								
								Add OpenAPI spec for StatusController
							
							
							
							
							
						 | 
						
							2020-05-13 00:25:21 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Stephanie Wilde-Hobbs
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a2fcfc78c9
								
							
						 | 
						
							
							
								
								Filter config descriptions by config whitelist
							
							
							
							
							
						 | 
						
							2020-05-12 21:07:33 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Stephanie Wilde-Hobbs
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								620247a015
								
							
						 | 
						
							
							
								
								Add database configuration whitelist
							
							
							
							
							
						 | 
						
							2020-05-12 17:12:27 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								b960a9430d
								
							
						 | 
						
							
							
								
								[#2456] credo fix.
							
							
							
							
							
						 | 
						
							2020-05-10 09:35:12 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								aee88d11be
								
							
						 | 
						
							
							
								
								[#2456] Removed support for embedded relationships in account view.
							
							
							
							
							
						 | 
						
							2020-05-10 09:16:48 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								14a49a0483
								
							
						 | 
						
							
							
								
								[#2456] Dropped support for embedded pleroma/account/relationship in statuses and notifications.
							
							
							
							
							
						 | 
						
							2020-05-09 18:05:44 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								b2924ab1fb
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
							
							
							
							
							
						 | 
						
							2020-05-08 21:37:55 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								3d0c567fbc
								
							
						 | 
						
							
							
								
								Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
							
							
							
							
							
						 | 
						
							2020-05-07 08:14:54 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								473b0d9f3d
								
							
						 | 
						
							
							
								
								Merge branch 'feature/delete-validator' into 'develop'
							
							
							
							
							
							
							
							Move deletions to the common pipeline
Closes #1497
See merge request pleroma/pleroma!2441 
							
						 | 
						
							2020-05-06 14:32:58 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								d5cdc907e3
								
							
						 | 
						
							
							
								
								Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering).
							
							
							
							
							
							
							
							Added support for :skip_notifications for accounts listing (index.json).
Adjusted tests. 
							
						 | 
						
							2020-05-01 18:45:24 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								1ead5f49b8
								
							
						 | 
						
							
							
								
								AdminApiController: Use common pipeline for user deletion.
							
							
							
							
							
						 | 
						
							2020-05-01 14:30:39 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								ebbd9c7f36
								
							
						 | 
						
							
							
								
								AdminAPIController: Refactor.
							
							
							
							
							
						 | 
						
							2020-05-01 14:22:39 +02: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/statuses by 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/statuses and GET /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 (accepts godmode and local_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/stats to 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 | 
						
						
							
							
							
								
							
							
						 |