feld 
								
							 
						 
						
							
							
							
							
								
							
							
								1255ec888d 
								
							 
						 
						
							
							
								
								Revert "Add upload limits to /api/v1/instance"  
							
							 
							
							... 
							
							
							
							This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa. 
							
						 
						
							2019-10-01 22:16:29 +00: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0c6009dd2e 
								
							 
						 
						
							
							
								
								Extract mascot actions from MastodonAPIController to MascotController  
							
							 
							
							
							
						 
						
							2019-09-30 19:32:43 +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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								7cad6ea67a 
								
							 
						 
						
							
							
								
								pleroma api: hook up scrobbler controller  
							
							 
							
							
							
						 
						
							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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								8d31530119 
								
							 
						 
						
							
							
								
								Cleanup ScheduledActivityView  
							
							 
							
							
							
						 
						
							2019-09-27 13:36:28 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								98d1347a4e 
								
							 
						 
						
							
							
								
								Extract status actions from MastodonAPIController into StatusController  
							
							 
							
							
							
						 
						
							2019-09-27 10:51:15 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								219771288c 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/common_api' into 'develop'  
							
							 
							
							... 
							
							
							
							Refactor `CommonAPI.post/2`
See merge request pleroma/pleroma!1713  
							
						 
						
							2019-09-27 03:46:02 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								73ae38ca04 
								
							 
						 
						
							
							
								
								add deprecated tag  
							
							 
							
							
							
						 
						
							2019-09-26 21:08:04 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								3d722dc200 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into tests/mastodon_api_controller.ex  
							
							 
							
							
							
						 
						
							2019-09-26 16:16:30 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								3572cf29b7 
								
							 
						 
						
							
							
								
								Extract timeline actions from MastodonAPIController into TimelineController  
							
							 
							
							
							
						 
						
							2019-09-26 10:53:42 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								eed774d058 
								
							 
						 
						
							
							
								
								Add CommonAPI.ActivityDraft  
							
							 
							
							
							
						 
						
							2019-09-26 10:29:34 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								1a858134ed 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1218  
							
							 
							
							
							
						 
						
							2019-09-25 12:24:12 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								035f22f784 
								
							 
						 
						
							
							
								
								Fix Credo warnings  
							
							 
							
							
							
						 
						
							2019-09-24 19:50:09 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								209395c7e6 
								
							 
						 
						
							
							
								
								Add User.change_info/2 and User.update_info/2  
							
							 
							
							
							
						 
						
							2019-09-24 19:50:07 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								a66a7a328f 
								
							 
						 
						
							
							
								
								Extract notification actions from MastodonAPIController into NotificationController  
							
							 
							
							
							
						 
						
							2019-09-24 15:16:44 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								79b25be4e1 
								
							 
						 
						
							
							
								
								Do not return tuple when unneeded  
							
							 
							
							
							
						 
						
							2019-09-24 15:03:20 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								d75d0ae134 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into tests/mastodon_api_controller.ex  
							
							 
							
							
							
						 
						
							2019-09-24 08:06:04 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								760df67a7b 
								
							 
						 
						
							
							
								
								Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'  
							
							 
							
							... 
							
							
							
							Fix private and direct statuses not being filtered out from the public timeline for an authenticated user.
Closes  #1223 
See merge request pleroma/pleroma!1703  
							
						 
						
							2019-09-23 22:35:09 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Steven Fuchs 
								
							 
						 
						
							
							
							
							
								
							
							
								e1d2d69c87 
								
							 
						 
						
							
							
								
								Clean up views  
							
							 
							
							
							
						 
						
							2019-09-23 22:33:59 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								494bb6bac6 
								
							 
						 
						
							
							
								
								updated tests  
							
							 
							
							
							
						 
						
							2019-09-23 22:37:30 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								179fa32dd5 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into tests/mastodon_api_controller.ex  
							
							 
							
							
							
						 
						
							2019-09-23 21:41:57 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								7cf1252455 
								
							 
						 
						
							
							
								
								Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (GET /api/v1/timelines/public)  
							
							 
							
							
							
						 
						
							2019-09-20 18:27:00 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								fe5e0b7846 
								
							 
						 
						
							
							
								
								Mastodon API: Return pleroma.direct_conversation_id when creating direct messages (POST /api/v1/statuses)  
							
							 
							
							
							
						 
						
							2019-09-19 08:59:25 +03:00