lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								2a7f44acfe
								
							
						 | 
						
							
							
								
								ActivityPub.Utils: Fix undo test.
							
							
							
							
							
						 | 
						
							2019-10-04 17:10:49 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								568a995d64
								
							
						 | 
						
							
							
								
								ActivityPub: Change addressing of Undo.
							
							
							
							
							
						 | 
						
							2019-10-04 16:32:42 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								27110793a7
								
							
						 | 
						
							
							
								
								Merge branch 'featrue/job-monitor' into 'develop'
							
							
							
							
							
							
							
							Add Pleroma.JobQueueMonitor
Closes #1274
See merge request pleroma/pleroma!1721 
							
						 | 
						
							2019-10-04 12:52:11 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								27e914955e
								
							
						 | 
						
							
							
								
								Merge branch 'fix/nickname-fail' into 'develop'
							
							
							
							
							
							
							
							Fix get_cached_by_nickname_or_id not allowing to get local users by nickname
Closes #1293
See merge request pleroma/pleroma!1777 
							
						 | 
						
							2019-10-04 11:54:05 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								8217292085
								
							
						 | 
						
							
							
								
								Fix get_cached_by_nickname_or_id not allowing to get local users by
							
							
							
							
							
							
							
							nickname
Closes #1293 
							
						 | 
						
							2019-10-04 14:44:09 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								01da6344b9
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix/notification-nil-actor' into 'develop'
							
							
							
							
							
							
							
							notification_view.ex: Make sure `account` isn’t empty
See merge request pleroma/pleroma!1779 
							
						 | 
						
							2019-10-04 11:28:20 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								5dc14c89ce
								
							
						 | 
						
							
							
								
								notification_view.ex: Make sure account isn’t empty
							
							
							
							
							
							
							
							Related: https://git.pleroma.social/pleroma/pleroma/issues/1203 
							
						 | 
						
							2019-10-04 07:11:53 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9b68aab8b3
								
							
						 | 
						
							
							
								
								Fix credo warning
							
							
							
							
							
						 | 
						
							2019-10-02 21:12:01 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								d3c404af12
								
							
						 | 
						
							
							
								
								Add MastoFEController
							
							
							
							
							
						 | 
						
							2019-10-02 20:36:08 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								1c6e1055c8
								
							
						 | 
						
							
							
								
								Add CustomEmojiController
							
							
							
							
							
						 | 
						
							2019-10-02 19:16:34 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								433f2c0f68
								
							
						 | 
						
							
							
								
								Merge branch 'split-masto-api/instance' into 'develop'
							
							
							
							
							
							
							
							Extract instance actions from `MastodonAPIController` to `InstanceController`
See merge request pleroma/pleroma!1760 
							
						 | 
						
							2019-10-02 10:46:14 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thibaut Girka
								
							 
						 | 
						
							
							
							
							
								
							
							
								86880b9821
								
							
						 | 
						
							
							
								
								Inline object when Announcing a self-owned private object
							
							
							
							
							
						 | 
						
							2019-10-02 12:15:06 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								0fc29deba0
								
							
						 | 
						
							
							
								
								Add tests for Pleroma.JobQueueMonitor
							
							
							
							
							
						 | 
						
							2019-10-02 15:24:21 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c8b01f6667
								
							
						 | 
						
							
							
								
								Extract instance actions from MastodonAPIController to InstanceController
							
							
							
							
							
						 | 
						
							2019-10-02 14:13:52 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								89ab673d00
								
							
						 | 
						
							
							
								
								Merge branch 'feature/send-identifier-on-oauth-error' into 'develop'
							
							
							
							
							
							
							
							Send an identifier alongside with error message in OAuthController
See merge request pleroma/pleroma!1765 
							
						 | 
						
							2019-10-02 07:04:33 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								8557176808
								
							
						 | 
						
							
							
								
								Merge branch 'split-masto-api/auth' into 'develop'
							
							
							
							
							
							
							
							Extract auth actions from `MastodonAPIController` to `AuthController`
See merge request pleroma/pleroma!1759 
							
						 | 
						
							2019-10-02 07:02:56 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								9b38bf4af4
								
							
						 | 
						
							
							
								
								Merge branch 'features/private-reblogs' into 'develop'
							
							
							
							
							
							
							
							Allow receiving private self-announces over ActivityPub
See merge request pleroma/pleroma!1766 
							
						 | 
						
							2019-10-02 07:02:24 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								1255ec888d
								
							
						 | 
						
							
							
								
								Revert "Add upload limits to /api/v1/instance"
							
							
							
							
							
							
							
							This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa. 
							
						 | 
						
							2019-10-01 22:16:29 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thibaut Girka
								
							 
						 | 
						
							
							
							
							
								
							
							
								427d0c2a00
								
							
						 | 
						
							
							
								
								Store private announcements in object.data["announcements"], filter them on display
							
							
							
							
							
						 | 
						
							2019-10-01 22:39:25 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Sergey Suprunenko
								
							 
						 | 
						
							
							
							
							
								
							
							
								c541b83bef
								
							
						 | 
						
							
							
								
								Track failed proxy urls and don't request them again
							
							
							
							
							
						 | 
						
							2019-10-01 20:00:27 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thibaut Girka
								
							 
						 | 
						
							
							
							
							
								
							
							
								7d5a9f3f6d
								
							
						 | 
						
							
							
								
								Add tests for privately announcing statuses via API
							
							
							
							
							
						 | 
						
							2019-10-01 20:38:29 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thibaut Girka
								
							 
						 | 
						
							
							
							
							
								
							
							
								e0b654e202
								
							
						 | 
						
							
							
								
								Add tests
							
							
							
							
							
						 | 
						
							2019-10-01 18:38:57 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								0f9c2c8b87
								
							
						 | 
						
							
							
								
								Send an identifier alongside with error message in OAuthController
							
							
							
							
							
						 | 
						
							2019-10-01 18:10:04 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								af690d1033
								
							
						 | 
						
							
							
								
								Extract auth actions from MastodonAPIController to AuthController
							
							
							
							
							
						 | 
						
							2019-10-01 15:54:45 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								2dad6dd020
								
							
						 | 
						
							
							
								
								Extract apps actions from MastodonAPIController to AppController
							
							
							
							
							
						 | 
						
							2019-10-01 15:21:46 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								39695c4436
								
							
						 | 
						
							
							
								
								Extract suggestions actions from MastodonAPIController to SuggestionController
							
							
							
							
							
						 | 
						
							2019-10-01 15:07:49 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								585bc57edb
								
							
						 | 
						
							
							
								
								Extract media actions from MastodonAPIController to MediaController
							
							
							
							
							
						 | 
						
							2019-10-01 14:36:35 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								36a34c36fe
								
							
						 | 
						
							
							
								
								Extract poll actions from MastodonAPIController to PollController
							
							
							
							
							
						 | 
						
							2019-10-01 11:44:34 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								dae744478e
								
							
						 | 
						
							
							
								
								Transmogrifier: Handle compact objects in undos.
							
							
							
							
							
						 | 
						
							2019-09-30 18:13:05 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								0c6009dd2e
								
							
						 | 
						
							
							
								
								Extract mascot actions from MastodonAPIController to MascotController
							
							
							
							
							
						 | 
						
							2019-09-30 19:32:43 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c55facf78b
								
							
						 | 
						
							
							
								
								Fix warning in TransmogrifierTest
							
							
							
							
							
						 | 
						
							2019-09-30 19:10:56 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								987e0b8be8
								
							
						 | 
						
							
							
								
								Move update_credentials to MastodonAPI.AccountController
							
							
							
							
							
						 | 
						
							2019-09-30 19:10:56 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c0ce2d5faf
								
							
						 | 
						
							
							
								
								Move account_register, relationships and verify_credentials to MastodonAPI.AccountController
							
							
							
							
							
						 | 
						
							2019-09-30 19:10:55 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								122cc050ab
								
							
						 | 
						
							
							
								
								Move account_lists test to MastodonAPI.AccountControllerTest
							
							
							
							
							
						 | 
						
							2019-09-30 19:10:55 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								38db4878a4
								
							
						 | 
						
							
							
								
								Disable async in DomainBlockControllerTest
							
							
							
							
							
						 | 
						
							2019-09-30 19:10:55 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								3c5ecb70b4
								
							
						 | 
						
							
							
								
								Add PleromaAPI.AccountController
							
							
							
							
							
						 | 
						
							2019-09-30 19:10:55 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								e7aef27c00
								
							
						 | 
						
							
							
								
								Fix merge
							
							
							
							
							
						 | 
						
							2019-09-30 19:10:54 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								1207e88195
								
							
						 | 
						
							
							
								
								Fix ReportControllerTest
							
							
							
							
							
						 | 
						
							2019-09-30 18:30:10 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								26f66fb70a
								
							
						 | 
						
							
							
								
								Merge branch 'features/apc2s-media-upload' into 'develop'
							
							
							
							
							
							
							
							AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706 
							
						 | 
						
							2019-09-30 11:21:49 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								0e356cc800
								
							
						 | 
						
							
							
								
								Merge branch 'split-masto-api/reports' into 'develop'
							
							
							
							
							
							
							
							Extract report actions from `MastodonAPIController` to `ReportController`
See merge request pleroma/pleroma!1744 
							
						 | 
						
							2019-09-30 11:17:30 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								74d8fadf37
								
							
						 | 
						
							
							
								
								Merge branch 'split-masto-api/conversations' into 'develop'
							
							
							
							
							
							
							
							Extract conversation actions from `MastodonAPIController` to ConversationController
See merge request pleroma/pleroma!1743 
							
						 | 
						
							2019-09-30 10:49:40 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b7f27a4f58
								
							
						 | 
						
							
							
								
								Extract report actions from MastodonAPIController to ReportController
							
							
							
							
							
							
							
							Update MastodonAPI.ReportView 
							
						 | 
						
							2019-09-30 17:44:10 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								1d7cbdaf7b
								
							
						 | 
						
							
							
								
								change new scrobble endpoint
							
							
							
							
							
						 | 
						
							2019-09-30 10:39:48 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								211008ae2f
								
							
						 | 
						
							
							
								
								test: fix scrobble controller tests
							
							
							
							
							
						 | 
						
							2019-09-30 10:39:48 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								71eff09e56
								
							
						 | 
						
							
							
								
								common api: make sure the generated IR is actually federatable
							
							
							
							
							
						 | 
						
							2019-09-30 10:39:48 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								e7309d3b60
								
							
						 | 
						
							
							
								
								test: transmogrifier: add test proving that transmogrifier can handle outgoing listens
							
							
							
							
							
						 | 
						
							2019-09-30 10:39:48 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								7cad6ea67a
								
							
						 | 
						
							
							
								
								pleroma api: hook up scrobbler controller
							
							
							
							
							
						 | 
						
							2019-09-30 10:39:17 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								2c82d8603b
								
							
						 | 
						
							
							
								
								common api: implement scrobbling
							
							
							
							
							
						 | 
						
							2019-09-30 10:39:17 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								172c74a77b
								
							
						 | 
						
							
							
								
								activitypub: transmogrifier: implement support for Listen activities
							
							
							
							
							
						 | 
						
							2019-09-30 10:39:17 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ariadne Conill
								
							 
						 | 
						
							
							
							
							
								
							
							
								1f9de2a8cd
								
							
						 | 
						
							
							
								
								activitypub: implement IR-level considerations for Listen activities
							
							
							
							
							
						 | 
						
							2019-09-30 10:39:17 +00:00 | 
						
						
							
							
							
								
							
							
						 |