Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								b7877e9b1c 
								
							 
						 
						
							
							
								
								mastodon api: implement rendering of listen activities  
							
							
							
						 
						
							2019-09-30 10:39:17 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								ab2ca3038f 
								
							 
						 
						
							
							
								
								Merge branch 'hide-follower-following-count' into 'develop'  
							
							... 
							
							
							
							Add a setting to hide follows/followers stats from the user profile
See merge request pleroma/pleroma!1663  
							
						 
						
							2019-09-18 21:13:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								7ef575d11e 
								
							 
						 
						
							
							
								
								Initial poll refresh support  
							
							... 
							
							
							
							Implement refreshing the object with an interval and call the function
when getting the poll. 
							
						 
						
							2019-09-18 18:13:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								450bf7a63c 
								
							 
						 
						
							
							
								
								Mastodon API: Add a setting to hide follow/follower count from the user view (hide_follows_count and hide_followers_count)  
							
							
							
						 
						
							2019-09-17 14:45:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								96816ceaa2 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'revert-4fabf83a' into 'develop'"  
							
							... 
							
							
							
							This reverts commit fe7fd331264fabf83ad0 
							
						 
						
							2019-09-16 17:55:04 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								c623b4324d 
								
							 
						 
						
							
							
								
								Revert "Merge branch 'streamer-refactoring' into 'develop'"  
							
							... 
							
							
							
							This reverts merge request !1653  
							
						 
						
							2019-09-16 09:09:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Steven Fuchs 
								
							 
						 
						
							
							
							
							
								
							
							
								aab264db82 
								
							 
						 
						
							
							
								
								Streamer refactoring  
							
							
							
						 
						
							2019-09-16 07:44:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5c5ebd3861 
								
							 
						 
						
							
							
								
								Mastodon API: Respect post privacy in favourited/reblogged endpoints  
							
							
							
						 
						
							2019-09-14 01:50:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1be09bde2d 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/add_link_headers' into 'develop'  
							
							... 
							
							
							
							Refactor `add_link_headers/7` -> `add_link_headers/3`
See merge request pleroma/pleroma!1636  
							
						 
						
							2019-09-13 17:06:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								46ae62d159 
								
							 
						 
						
							
							
								
								Merge branch 'patch-5' into 'develop'  
							
							... 
							
							
							
							Mastodon API: URI encode hashtag name in generated URLs
See merge request pleroma/pleroma!1642  
							
						 
						
							2019-09-11 17:47:19 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								fb7332aec7 
								
							 
						 
						
							
							
								
								Merge branch 'fix/oom-parallel-rendering' into 'develop'  
							
							... 
							
							
							
							Revert "Parallelize template rendering"
See merge request pleroma/pleroma!1654  
							
						 
						
							2019-09-11 11:21:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								43f02dfe38 
								
							 
						 
						
							
							
								
								Revert "Parallelize template rendering"  
							
							... 
							
							
							
							This reverts commit 1ad71592ad 
							
						 
						
							2019-09-10 22:01:45 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								b40b10b53d 
								
							 
						 
						
							
							
								
								Add an endpoint to get multiple statuses by IDs  
							
							
							
						 
						
							2019-09-10 13:39:45 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									shadowfacts 
								
							 
						 
						
							
							
							
							
								
							
							
								e5c6bf3673 
								
							 
						 
						
							
							
								
								Mastodon API: URI encode hashtag name in generated URLs  
							
							... 
							
							
							
							Otherwise hashtags with word characters other than those allowed in URLs (e.g. Japanese characters) produce hashtag URLs that are invalid. 
							
						 
						
							2019-09-07 19:50:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								ab2f21e470 
								
							 
						 
						
							
							
								
								tests for mastodon_api_controller.ex  
							
							
							
						 
						
							2019-09-06 21:50:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								eb74c3d5c7 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1218  
							
							
							
						 
						
							2019-09-06 14:01:07 +03:00