| 
								
								
									 Egor Kislitsyn | 36a34c36fe | Extract poll actions from MastodonAPIControllertoPollController | 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 MastodonAPIControllerto 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 MastodonAPIControllertoReportControllerUpdate 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 |  | 
				
					
						| 
								
								
									 Ariadne Conill | b7877e9b1c | mastodon api: implement rendering of listen activities | 2019-09-30 10:39:17 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | c3d09921e4 | test: factory: implement support for generating mock audio and listen objects | 2019-09-30 10:39:17 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | d4d88b3361 | Extract conversation actions from MastodonAPIControllerto ConversationController | 2019-09-30 16:52:07 +07:00 |  | 
				
					
						| 
								
								
									 rinpatch | e9d1aa75d5 | Revert subscription refactoring. As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10, reversing
changes made toc4fbb56984. | 2019-09-29 18:43:27 +03:00 |  | 
				
					
						| 
								
								
									 kaniini | 6d74a7528c | Merge branch 'feature/follow-requests-count' into 'develop' Mastodon API: add follow_requests_count
See merge request pleroma/pleroma!1726 | 2019-09-29 11:44:31 +00:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 1053319cd6 | Merge branch 'develop' into tests/mastodon_api_controller.ex | 2019-09-28 10:36:04 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 9202904da9 | status_controller.ex: Posting media status without content defined | 2019-09-28 01:53:41 +02:00 |  | 
				
					
						| 
								
								
									 rinpatch | 374f83d29b | Fix not being able to post empty statuses with attachments Attachment field was filled in after the empty status check | 2019-09-28 01:58:06 +03:00 |  | 
				
					
						| 
								
								
									 minibikini | f9380289eb | Add remote_ipplug | 2019-09-27 21:59:23 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 92d08d4113 | Merge branch 'split-masto-api/follow-requests' into 'develop' Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
See merge request pleroma/pleroma!1730 | 2019-09-27 07:54:54 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 68bf99baf2 | Merge branch 'split-masto-api/domain-blocks' into 'develop' Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
See merge request pleroma/pleroma!1729 | 2019-09-27 07:54:08 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 27a3221d57 | Merge branch 'split-masto-api/scheduled-statuses' into 'develop' Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
See merge request pleroma/pleroma!1728 | 2019-09-27 07:53:22 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 408750b94e | Extract domain blocks actions from MastodonAPIControllertoDomainBlockController | 2019-09-27 14:28:05 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 99c5a35890 | Extract follow requests actions from MastodonAPIControllertoFollowRequestController | 2019-09-27 14:25:17 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 0a5b106ddd | Extract scheduled statuses actions from MastodonAPIControllertoScheduledActivityController | 2019-09-27 13:36:28 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 621377f378 | Extract filter actions from MastodonAPIControllertoFilterController | 2019-09-27 13:06:25 +07:00 |  | 
				
					
						| 
								
								
									 kaniini | 91e2bcf218 | Merge branch 'refactor/status-controller' into 'develop' Extract status actions from `MastodonAPIController` to `StatusController`
See merge request pleroma/pleroma!1719 | 2019-09-27 04:37:48 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | 14294243a2 | mastodon api: implement follow_requests_count | 2019-09-27 04:22:40 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 5ea5c58a85 | Move view logic from StatusController.context to StatusView and add a test | 2019-09-27 10:52:47 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 76b7e5cd5b | Move StatusController tests from MastodonAPIControllerTest to StatusControllerTest | 2019-09-27 10:52:47 +07:00 |  | 
				
					
						| 
								
								
									 kaniini | eb9aa7aa10 | Merge branch 'refactor/subscription' into 'develop' Refactor subscription functionality
Closes #1130
See merge request pleroma/pleroma!1664 | 2019-09-27 03:51:24 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 98d1347a4e | Extract status actions from MastodonAPIControllerintoStatusController | 2019-09-27 10:51:15 +07:00 |  | 
				
					
						| 
								
								
									 kaniini | dc0fdb5e84 | Merge branch 'refactor/timeline-controller' into 'develop' Extract timeline actions from `MastodonAPIController` into `TimelineController`
See merge request pleroma/pleroma!1648 | 2019-09-27 03:42:30 +00:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | b4fc96f640 | Merge branch 'develop' into tests/mastodon_api_controller.ex | 2019-09-26 20:56:59 +03:00 |  | 
				
					
						| 
								
								
									 Maxim Filippov | e7836adf21 | Merge branch 'develop' into feature/moderation-log-filters | 2019-09-26 19:01:54 +03:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 3d722dc200 | Merge branch 'develop' into tests/mastodon_api_controller.ex | 2019-09-26 16:16:30 +03:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | b4b147000c | Merge develop | 2019-09-26 10:38:54 +03:00 |  |