| 
								
								
									 lain | 17a8342c1e | ObjectValidators: Add basic Announce validator. | 2020-05-18 16:45:11 +02:00 |  | 
				
					
						| 
								
								
									 lain | 63ab2743ce | TransmogrifierTest: Fix tests. | 2020-05-18 15:47:26 +02:00 |  | 
				
					
						| 
								
								
									 lain | 7d381b16b7 | Transmogrifier Test: Extract Announce handling. | 2020-05-18 14:48:37 +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 | bfdd90f6d7 | AuthenticationPlug: Also update crypt passwords. | 2020-05-17 11:40:25 +02:00 |  | 
				
					
						| 
								
								
									 lain | baef35bcc8 | Authentication Plug: Update bcrypt password on login. | 2020-05-17 10:31:01 +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 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 3c29f4f957 | returning partial chain | 2020-05-15 16:16:02 +03: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 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | bb03dfdb03 | Do not require descriptioninupdateaction | 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 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | cb363f0183 | MastodonAPI: /api/v2/media endpoints | 2020-05-14 10:14:28 +02:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | 9cbf17d59f | Handle bcrypt passwords for Mastodon migration | 2020-05-13 10:53:56 -05:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 6802dc28ba | Add OpenAPI spec for PleromaAPI.AccountController | 2020-05-13 19:06:46 +04:00 |  | 
				
					
						| 
								
								
									 lain | da550be066 | Merge branch 'fix/1742-random-failing-tests' into 'develop' Fix sporadically failing tests
See merge request pleroma/pleroma!2524 | 2020-05-13 13:38:32 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | bcadbf964a | Add OpenAPI spec for SuggestionController | 2020-05-13 14:15:24 +04: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 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | fbe3d3aa5f | ignore order | 2020-05-13 11:38:23 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 2c356a4bac | don't use async with global mocks | 2020-05-13 11:38:23 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 12635bc156 | don't use global mocks in setup callbacks | 2020-05-13 11:38:22 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | b962b24e6f | don't run in async if tests depend on env config | 2020-05-13 11:38:22 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | ec27f346ee | correct order for publised in assert | 2020-05-13 11:38:22 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | e0944dee99 | make test fail everytime | 2020-05-13 11:38:22 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 712055612f | don't run tests which change env in async | 2020-05-13 11:38:22 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 4ba913d641 | {:error, :enoent} s3 fix s3 tests were executed before temp file was uploaded | 2020-05-13 11:38:21 +03: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 | 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 href | 68cca29dcf | Fix typo in test | 2020-05-12 18:51:10 +02: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 |  | 
				
					
						| 
								
								
									 rinpatch | 4cc71aad65 | Merge branch '1748-remote-following-follower-count' into 'develop' Transmogrifier: On incoming follow accept, update follow counts.
Closes #1748
See merge request pleroma/pleroma!2515 | 2020-05-12 16:44:58 +00: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 | dfb90a1fd6 | Transmogrifier: Add tests for certain announces | 2020-05-12 12:50:48 +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 |  | 
				
					
						| 
								
								
									 lain | 679afb2de4 | SideEffects test: Add test for favorite deletion. | 2020-05-11 15:38:19 +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 |  |