lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								188b32145e
								
							
						 | 
						
							
							
								
								InstanceView: Expose background image link.
							
							
							
							
							
							
							
							This will make it easier for more clients to support this feature. 
							
						 | 
						
							2020-05-18 13:29:30 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								96f7b1b140
								
							
						 | 
						
							
							
								
								Merge branch 'show-media-endpoint-fixes' into 'develop'
							
							
							
							
							
							
							
							MediaController OAuth scope assignments fix
See merge request pleroma/pleroma!2541 
							
						 | 
						
							2020-05-18 10:57:59 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								9b76565264
								
							
						 | 
						
							
							
								
								MediaController: enforced owner-only access in :show action.
							
							
							
							
							
							
							
							Improved error response on denied access (now 403). Adjusted tests. 
							
						 | 
						
							2020-05-18 09:51:53 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								8bfd9710ae
								
							
						 | 
						
							
							
								
								Pleroma Authenticator: Also update passwords here.
							
							
							
							
							
						 | 
						
							2020-05-17 11:53:17 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								af9dfdce6b
								
							
						 | 
						
							
							
								
								MediaController OAuth scope assignments fix.
							
							
							
							
							
							
							
							Typo fix (`def get_media` instead of `def show`). 
							
						 | 
						
							2020-05-17 08:46:43 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								d96f8f17e8
								
							
						 | 
						
							
							
								
								Merge branch 'features/mastoapi_v2_media' into 'develop'
							
							
							
							
							
							
							
							MastodonAPI: /api/v2/media endpoints
See merge request pleroma/pleroma!2439 
							
						 | 
						
							2020-05-16 17:13:38 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								2dcb26a6e5
								
							
						 | 
						
							
							
								
								CommonAPI: Unblock a user even if we don't have an activity.
							
							
							
							
							
						 | 
						
							2020-05-16 12:28:24 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e090191d03
								
							
						 | 
						
							
							
								
								[OpenAPI] Mark all not required request fields as nullable
							
							
							
							
							
						 | 
						
							2020-05-15 14:55:41 +04: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								4157c459b8
								
							
						 | 
						
							
							
								
								Merge branch 'bcrypt-auth' into 'develop'
							
							
							
							
							
							
							
							Handle bcrypt passwords for Mastodon migration
See merge request pleroma/pleroma!2527 
							
						 | 
						
							2020-05-14 14:36:56 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5b0f27d23d
								
							
						 | 
						
							
							
								
								Pbkdf2.verify_pass --> AuthenticationPlug.checkpw
							
							
							
							
							
						 | 
						
							2020-05-14 08:57:38 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								bb03dfdb03
								
							
						 | 
						
							
							
								
								Do not require description in update action
							
							
							
							
							
						 | 
						
							2020-05-14 16:29:32 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								0f885b4b86
								
							
						 | 
						
							
							
								
								Fix OpenAPI spec
							
							
							
							
							
						 | 
						
							2020-05-14 16:18:30 +04: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								099e314a1b
								
							
						 | 
						
							
							
								
								Add OpenAPISpex for MediaController
							
							
							
							
							
						 | 
						
							2020-05-14 12:13:25 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								359d7b0a6d
								
							
						 | 
						
							
							
								
								Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
							
							
							
							
							
						 | 
						
							2020-05-14 09:09:11 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								1c2629328d
								
							
						 | 
						
							
							
								
								Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_account_operation.ex
							
							
							
							
							
						 | 
						
							2020-05-14 09:07:09 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								cb363f0183
								
							
						 | 
						
							
							
								
								MastodonAPI: /api/v2/media endpoints
							
							
							
							
							
						 | 
						
							2020-05-14 10:14:28 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								8062d590dd
								
							
						 | 
						
							
							
								
								[#2456] OpenAPI-related tweaks. Removed support for with_relationships param in GET /api/v1/accounts/search.
							
							
							
							
							
						 | 
						
							2020-05-13 18:56:45 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6802dc28ba
								
							
						 | 
						
							
							
								
								Add OpenAPI spec for PleromaAPI.AccountController
							
							
							
							
							
						 | 
						
							2020-05-13 19:06:46 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								59b6d5f2aa
								
							
						 | 
						
							
							
								
								[#2456] Changed embed_relationships param to with_relationships.
							
							
							
							
							
						 | 
						
							2020-05-13 15:08:07 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								bcadbf964a
								
							
						 | 
						
							
							
								
								Add OpenAPI spec for SuggestionController
							
							
							
							
							
						 | 
						
							2020-05-13 14:15:24 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								33b798425f
								
							
						 | 
						
							
							
								
								[#2456] Post-merge fix.
							
							
							
							
							
						 | 
						
							2020-05-13 12:50:52 +03: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								156c8a5088
								
							
						 | 
						
							
							
								
								Merge branch 'openapi/statuses' into 'develop'
							
							
							
							
							
							
							
							Add OpenAPI spec for StatusController
See merge request pleroma/pleroma!2521 
							
						 | 
						
							2020-05-13 09:34:30 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								1307d6ca3c
								
							
						 | 
						
							
							
								
								Merge branch 'openapi/timelines' into 'develop'
							
							
							
							
							
							
							
							Add OpenAPI spec for TimelineController
See merge request pleroma/pleroma!2506 
							
						 | 
						
							2020-05-13 09:33:37 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b46811a074
								
							
						 | 
						
							
							
								
								Upgrade Comeonin to v5
							
							
							
							
							
							
							
							https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md 
							
						 | 
						
							2020-05-12 17:14:59 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								79ad12064d
								
							
						 | 
						
							
							
								
								Fix format
							
							
							
							
							
						 | 
						
							2020-05-13 01:59:17 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									minibikini
								
							 
						 | 
						
							
							
							
							
								
							
							
								cb1a3e196c
								
							
						 | 
						
							
							
								
								Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
							
							
							
							
							
						 | 
						
							2020-05-12 21:23:43 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									minibikini
								
							 
						 | 
						
							
							
							
							
								
							
							
								5a2333925c
								
							
						 | 
						
							
							
								
								Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
							
							
							
							
							
						 | 
						
							2020-05-12 21:23:36 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									minibikini
								
							 
						 | 
						
							
							
							
							
								
							
							
								822e9c09aa
								
							
						 | 
						
							
							
								
								Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
							
							
							
							
							
						 | 
						
							2020-05-12 21:23:21 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									minibikini
								
							 
						 | 
						
							
							
							
							
								
							
							
								40646a7e0e
								
							
						 | 
						
							
							
								
								Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
							
							
							
							
							
						 | 
						
							2020-05-12 21:14:52 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									minibikini
								
							 
						 | 
						
							
							
							
							
								
							
							
								0bb164a3e1
								
							
						 | 
						
							
							
								
								Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
							
							
							
							
							
						 | 
						
							2020-05-12 21:12:22 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									minibikini
								
							 
						 | 
						
							
							
							
							
								
							
							
								648cc0d72d
								
							
						 | 
						
							
							
								
								Apply suggestion to lib/pleroma/web/api_spec/operations/status_operation.ex
							
							
							
							
							
						 | 
						
							2020-05-12 21:09:26 +00: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								bfb48e3db6
								
							
						 | 
						
							
							
								
								[#2456] OpenAPI: added embed_relationships param definition.
							
							
							
							
							
						 | 
						
							2020-05-12 20:55:01 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								2b18b8a263
								
							
						 | 
						
							
							
								
								Merge branch 'streamer-get-topic' into 'develop'
							
							
							
							
							
							
							
							Expand and authorize streams in Streamer directly
See merge request pleroma/pleroma!2519 
							
						 | 
						
							2020-05-12 17:02:57 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								24c8c13640
								
							
						 | 
						
							
							
								
								Merge branch '1757-blocks-breaking-on-disabled-outgoing-blocks' into 'develop'
							
							
							
							
							
							
							
							ActivityPub: Fix non-federating blocks.
Closes #1757
See merge request pleroma/pleroma!2514 
							
						 | 
						
							2020-05-12 16:45:46 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								63a1a82f38
								
							
						 | 
						
							
							
								
								[#2456] Added support for embed_relationships param, nailed down endpoints which should support it. Fixed :source_mutes relationships subset fetching.
							
							
							
							
							
						 | 
						
							2020-05-12 19:14:35 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Stephanie Wilde-Hobbs
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								620247a015
								
							
						 | 
						
							
							
								
								Add database configuration whitelist
							
							
							
							
							
						 | 
						
							2020-05-12 17:12:27 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
							
							
								
							
							
								e6d8cacf2d
								
							
						 | 
						
							
							
								
								Expand and authorize streams in Streamer directly
							
							
							
							
							
						 | 
						
							2020-05-12 18:04:47 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								ca31af473c
								
							
						 | 
						
							
							
								
								Transmogrifier: On incoming follow accept, update follow counts.
							
							
							
							
							
						 | 
						
							2020-05-12 12:29:37 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								d0ba1844b0
								
							
						 | 
						
							
							
								
								ActivityPub: Fix non-federating blocks.
							
							
							
							
							
						 | 
						
							2020-05-12 10:52:46 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								f8190aea5e
								
							
						 | 
						
							
							
								
								Merge branch 'fix/issue-1676' into 'develop'
							
							
							
							
							
							
							
							[#1676] fixed 'source' object in verify_credentials
See merge request pleroma/pleroma!2492 
							
						 | 
						
							2020-05-11 22:30:36 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
							
							
								
							
							
								e2b15e8ad3
								
							
						 | 
						
							
							
								
								Fix streamer timeout (closes #1753).
							
							
							
							
							
							
							
							Cowboy handles automatically responding to the client's ping, but
doesn't automatically send a :ping frame to the client. 
							
						 | 
						
							2020-05-11 16:51:34 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								5367a00257
								
							
						 | 
						
							
							
								
								Deletion: Handle the case of pruned objects.
							
							
							
							
							
						 | 
						
							2020-05-11 15:06:23 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								3bde0fa3f6
								
							
						 | 
						
							
							
								
								Add OpenAPI spec for TimelineController
							
							
							
							
							
						 | 
						
							2020-05-11 15:43:03 +04:00 | 
						
						
							
							
							
								
							
							
						 |