| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 3572cf29b7 | Extract timeline actions from MastodonAPIControllerintoTimelineController | 2019-09-26 10:53:42 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | a66a7a328f | Extract notification actions from MastodonAPIControllerintoNotificationController | 2019-09-24 15:16:44 +07:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 6f67aed3ac | [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes # Conflicts:
#	lib/pleroma/web/admin_api/admin_api_controller.ex | 2019-09-19 10:59:09 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 95c948110c | Add rel="ugc"to hashtags and mentions | 2019-09-19 14:56:10 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | cf3041220a | Add support for rel="ugc" | 2019-09-19 14:56:10 +07:00 |  | 
				
					
						| 
								
								
									 eugenijm | 450bf7a63c | Mastodon API: Add a setting to hide follow/follower count from the user view ( hide_follows_countandhide_followers_count) | 2019-09-17 14:45:47 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | e6f43a831b | [#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes). | 2019-09-15 18:22:08 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 019ced0558 | Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers and test/web/mastodon_api/views | 2019-08-26 19:37:57 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 30510ade0e | Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests | 2019-08-26 19:37:54 +07:00 |  |