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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								b7877e9b1c 
								
							 
						 
						
							
							
								
								mastodon api: implement rendering of listen activities  
							
							
							
						 
						
							2019-09-30 10:39:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d4d88b3361 
								
							 
						 
						
							
							
								
								Extract conversation actions from MastodonAPIController to ConversationController  
							
							
							
						 
						
							2019-09-30 16:52:07 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e9d1aa75d5 
								
							 
						 
						
							
							
								
								Revert subscription refactoring.  
							
							... 
							
							
							
							As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10c4fbb56984 
							
						 
						
							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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 MastodonAPIController to DomainBlockController  
							
							
							
						 
						
							2019-09-27 14:28:05 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								99c5a35890 
								
							 
						 
						
							
							
								
								Extract follow requests actions from MastodonAPIController to FollowRequestController  
							
							
							
						 
						
							2019-09-27 14:25:17 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								0a5b106ddd 
								
							 
						 
						
							
							
								
								Extract scheduled statuses actions from MastodonAPIController to ScheduledActivityController  
							
							
							
						 
						
							2019-09-27 13:36:28 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								621377f378 
								
							 
						 
						
							
							
								
								Extract filter actions from MastodonAPIController to FilterController  
							
							
							
						 
						
							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 MastodonAPIController into StatusController  
							
							
							
						 
						
							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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								3572cf29b7 
								
							 
						 
						
							
							
								
								Extract timeline actions from MastodonAPIController into TimelineController  
							
							
							
						 
						
							2019-09-26 10:53:42 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								6abe12dced 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/notification-controller' into 'develop'  
							
							... 
							
							
							
							Extract notification actions from `MastodonAPIController` into `NotificationController`
See merge request pleroma/pleroma!1646  
							
						 
						
							2019-09-26 03:13:22 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								a39e065916 
								
							 
						 
						
							
							
								
								Merge branch 'feature/return-link-for-password-reset' into 'develop'  
							
							... 
							
							
							
							Admin API: Return link alongside with token on password reset
See merge request pleroma/pleroma!1691  
							
						 
						
							2019-09-26 03:12:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								48a82c4609 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/user' into 'develop'  
							
							... 
							
							
							
							Simplify updating user's `info`
See merge request pleroma/pleroma!1712  
							
						 
						
							2019-09-26 03:00:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								5fb72170a7 
								
							 
						 
						
							
							
								
								Revert "add _discoverable_ keyword into ActivityPub @context"  
							
							... 
							
							
							
							This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5. 
							
						 
						
							2019-09-26 02:57:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								beabc49e35 
								
							 
						 
						
							
							
								
								Merge branch 'feature/activities-pagination-by-offset' into 'develop'  
							
							... 
							
							
							
							Allow activities pagination via limit/offset
See merge request pleroma/pleroma!1714  
							
						 
						
							2019-09-26 02:49:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								1b9cd4c866 
								
							 
						 
						
							
							
								
								Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop'  
							
							... 
							
							
							
							Don't embed the first page in inboxes/outboxes and refactor the views to follow View/Controller pattern
See merge request pleroma/pleroma!1716  
							
						 
						
							2019-09-26 00:03:47 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d87be2ec96 
								
							 
						 
						
							
							
								
								Don't embed the first page in inboxes/outboxes and refactor the views to  
							
							... 
							
							
							
							follow View/Controller pattern
Note that I mentioned the change in 1.1 section because I intend to
backport this, if this is not needed I will move it back to Unreleased. 
							
						 
						
							2019-09-25 15:59:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								118d6dcdf4 
								
							 
						 
						
							
							
								
								Fix nodeinfo handling  
							
							
							
						 
						
							2019-09-25 12:32:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								ba9d35a904 
								
							 
						 
						
							
							
								
								Add an API endpoint for listing remote packs  
							
							
							
						 
						
							2019-09-25 12:32:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								60cbea5bb2 
								
							 
						 
						
							
							
								
								Allow activities pagination via limit/offset  
							
							
							
						 
						
							2019-09-25 01:25:42 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								209395c7e6 
								
							 
						 
						
							
							
								
								Add User.change_info/2 and User.update_info/2  
							
							
							
						 
						
							2019-09-24 19:50:07 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maxim Filippov 
								
							 
						 
						
							
							
							
							
								
							
							
								5e9759cd7d 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/return-link-for-password-reset  
							
							
							
						 
						
							2019-09-24 13:00:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								a66a7a328f 
								
							 
						 
						
							
							
								
								Extract notification actions from MastodonAPIController into NotificationController  
							
							
							
						 
						
							2019-09-24 15:16:44 +07:00