| 
								
								
									 rinpatch | d35be02e70 | Merge branch 'refactor-add-mention-step-one' into 'develop' Fix ObjectView calling into strange functions
Closes #1807
See merge request pleroma/pleroma!2580 | 2020-05-27 14:17:12 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 3601c0015c | Merge branch '1808-pleroma-sucks' into 'develop' Resolve "Don't fail message ingestions when we can't update a user"
Closes #1808
See merge request pleroma/pleroma!2576 | 2020-05-26 15:57:01 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | d7a57004ef | [#1501] Made user feed contain public and unlisted activities. | 2020-05-25 23:27:47 +03:00 |  | 
				
					
						| 
								
								
									 lain | 6bd7070b00 | Transmogrifier: Use a simpler way to get mentions. | 2020-05-25 15:08:43 +02:00 |  | 
				
					
						| 
								
								
									 lain | f20dff451e | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-pleroma-sucks | 2020-05-25 14:01:16 +02:00 |  | 
				
					
						| 
								
								
									 lain | 5d5db7e5b7 | StealEmojiPolicyTest: Clean up. | 2020-05-25 14:00:18 +02:00 |  | 
				
					
						| 
								
								
									 lain | 2dff376041 | StealEmojiPolicyTest: Fix flaky test. | 2020-05-25 13:58:14 +02:00 |  | 
				
					
						| 
								
								
									 lain | aeb0875025 | StealEmojiPolicyTest: Fix flaky test. | 2020-05-25 13:48:47 +02:00 |  | 
				
					
						| 
								
								
									 lain | ec470c4c77 | Merge branch 'openapi/admin/status' into 'develop' Add OpenAPI spec for AdminAPI.StatusController
See merge request pleroma/pleroma!2566 | 2020-05-25 11:40:54 +00:00 |  | 
				
					
						| 
								
								
									 lain | d0c26956da | User: Don't error out if we want to refresh a user but can't | 2020-05-25 12:46:14 +02:00 |  | 
				
					
						| 
								
								
									 rinpatch | 7bc2ec0aa2 | Merge branch 'mastodon-migration-compat' into 'develop' Add compatibility routes for converted mastodon instances
Closes #1797
See merge request pleroma/pleroma!2572 | 2020-05-24 19:05:57 +00:00 |  | 
				
					
						| 
								
								
									 lain | ddbbefeb2e | Merge branch 'feature/configure-filename-truncate' into 'develop' Configurable filename truncation threshold
Closes #1799
See merge request pleroma/pleroma!2573 | 2020-05-22 16:05:35 +00:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | cc82229ba7 | Add filename_display_max_length config | 2020-05-22 18:19:25 +03:00 |  | 
				
					
						| 
								
								
									 lain | 91c8467582 | OStatusController: Add Mastodon activity compat route. | 2020-05-22 17:11:59 +02:00 |  | 
				
					
						| 
								
								
									 lain | 355aa3bdc7 | ActivityPubController: Add Mastodon activity compat route. | 2020-05-22 17:06:12 +02:00 |  | 
				
					
						| 
								
								
									 lain | 8a4bd9e5d1 | OStatusController: Add Mastodon compatibility route for objects. | 2020-05-22 16:47:22 +02:00 |  | 
				
					
						| 
								
								
									 rinpatch | 1fa7aa9fc5 | Merge branch 'emoji-react-better-errors' into 'develop' EmojiReactionController: Return more appropriate error.
See merge request pleroma/pleroma!2569 | 2020-05-22 14:36:08 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | ba106aa9c8 | Fix notifications mark as read API | 2020-05-22 18:15:36 +04:00 |  | 
				
					
						| 
								
								
									 lain | ca755f9a73 | ActivityPubController: Add Mastodon compatibility route. | 2020-05-22 16:15:29 +02:00 |  | 
				
					
						| 
								
								
									 lain | bcb549531f | EmojiReactionController: Return more appropriate error. | 2020-05-22 14:38:28 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn | 7b02bfca51 | Merge branch 'announce-validator' into 'develop' Announce validator
See merge request pleroma/pleroma!2567 | 2020-05-22 05:47:53 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn | a57e7f3503 | Merge branch '1113-op-mentioning' into 'develop' CommonAPI: Change public->private implicit addressing.
Closes #1113
See merge request pleroma/pleroma!2563 | 2020-05-22 05:22:07 +00:00 |  | 
				
					
						| 
								
								
									 lain | a42a0716ec | Merge branch 'features/emoji_stealer' into 'develop' MRF.StealEmojiPolicy: New Policy
See merge request pleroma/pleroma!2385 | 2020-05-21 13:31:49 +00:00 |  | 
				
					
						| 
								
								
									 lain | f166316f50 | Merge branch 'openapi/pleroma-api/pleroma' into 'develop' Add OpenAPI spec for PleromaAPI.PleromaAPIController
See merge request pleroma/pleroma!2564 | 2020-05-21 13:30:09 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 45d2c4157f | Add OpenAPI spec for AdminAPI.StatusController | 2020-05-21 17:23:12 +04:00 |  | 
				
					
						| 
								
								
									 lain | bf1b221f94 | Credo fixes for the credo god. | 2020-05-21 14:12:32 +02:00 |  | 
				
					
						| 
								
								
									 lain | cdc6ba8d7b | AnnounceValidator: Check for announcability | 2020-05-21 13:58:18 +02:00 |  | 
				
					
						| 
								
								
									 lain | c76267afb9 | Credo fixes. | 2020-05-21 13:31:52 +02:00 |  | 
				
					
						| 
								
								
									 lain | 23e248694d | Announcements: Fix all tests. | 2020-05-21 13:16:21 +02:00 |  | 
				
					
						| 
								
								
									 lain | d9d425708e | SideEffects: Builed out Announce effects. | 2020-05-21 12:43:09 +02:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 9de9760aa6 | Move status actions to AdminAPI.StatusController | 2020-05-21 13:52:30 +04:00 |  | 
				
					
						| 
								
								
									 lain | 39031f4860 | Pipeline: Don't federate if federation is disabled. | 2020-05-20 16:36:55 +02:00 |  | 
				
					
						| 
								
								
									 lain | e42bc5f557 | Announcements: Handle through common pipeline. | 2020-05-20 15:44:37 +02:00 |  | 
				
					
						| 
								
								
									 lain | 265746b21f | Merge branch 'openapi/pleroma-api/emojis' into 'develop' Add OpenAPI spec for EmojiPackController
See merge request pleroma/pleroma!2549 | 2020-05-20 12:08:28 +00:00 |  | 
				
					
						| 
								
								
									 lain | c7cdc553ff | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into announce-validator | 2020-05-20 14:02:40 +02:00 |  | 
				
					
						| 
								
								
									 lain | 423ea497bb | Merge branch 'feature/1734-user-deletion' into 'develop' User deletion
Closes #1734
See merge request pleroma/pleroma!2493 | 2020-05-20 11:43:49 +00:00 |  | 
				
					
						| 
								
								
									 lain | eb5f428565 | CommonAPI: Change public->private implicit addressing. This will not add the OP to the `to` field anymore when going from
public to private. | 2020-05-20 13:38:47 +02:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 5ba6e1c322 | Move notification actions to PleromaAPI.NotificationController | 2020-05-20 15:15:13 +04:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | f3fc8b22b1 | Move conversation actions to PleromaAPI.ConversationController | 2020-05-20 15:15:13 +04:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 9a5de0f454 | Move reaction actions to EmojiReactionController | 2020-05-20 15:15:13 +04:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 490a3a34b6 | Add OpenAPI spec for PleromaAPI.PleromaAPIController | 2020-05-20 15:15:13 +04:00 |  | 
				
					
						| 
								
								
									 Haelwenn | 94ba5a7802 | Merge branch 'exposed-background-image' into 'develop' InstanceView: Expose background image link.
See merge request pleroma/pleroma!2545 | 2020-05-20 10:53:54 +00:00 |  | 
				
					
						| 
								
								
									 lain | 6dd1575c64 | Merge branch 'issue/1509' into 'develop' [#1509]  purge media from cache after delete
See merge request pleroma/pleroma!2539 | 2020-05-20 10:35:36 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 6609714d66 | Move Scrobble views to ScrobbleView | 2020-05-19 16:26:06 +04:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 524d04d921 | Add OpenAPI spec for PleromaAPI.ScrobbleController | 2020-05-19 16:26:06 +04:00 |  | 
				
					
						| 
								
								
									 Haelwenn | 58ccd2bbfd | Merge branch 'openapi/pleroma-api/mascot' into 'develop' Add OpenAPI spec for MascotController
See merge request pleroma/pleroma!2553 | 2020-05-19 09:41:57 +00:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 41f8f17260 | fix api/v1/accounts/update_credentials | 2020-05-19 09:42:41 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 5f0a3ac74d | added tests | 2020-05-19 06:05:09 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | fe5d423b43 | Add OpenAPI spec for MascotController | 2020-05-18 22:01:18 +04:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 45c3a72404 | [OpenAPI] Use BooleanLike in all request bodies | 2020-05-18 20:58:59 +04:00 |  |