| 
								
								
									 Egor Kislitsyn | 39695c4436 | Extract suggestions actions from MastodonAPIControllertoSuggestionController | 2019-10-01 15:07:49 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 585bc57edb | Extract media actions from MastodonAPIControllertoMediaController | 2019-10-01 14:36:35 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 36a34c36fe | Extract poll actions from MastodonAPIControllertoPollController | 2019-10-01 11:44:34 +07:00 |  | 
				
					
						| 
								
								
									 kPherox | f364438032 | Add rel="ugc" | 2019-10-01 02:24:06 +09:00 |  | 
				
					
						| 
								
								
									 kPherox | a0f101ee80 | Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials | 2019-10-01 01:40:33 +09: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 | 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 | 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 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | b7f27a4f58 | Extract report actions from MastodonAPIControllertoReportControllerUpdate MastodonAPI.ReportView | 2019-09-30 17:44:10 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | d4d88b3361 | Extract conversation actions from MastodonAPIControllerto ConversationController | 2019-09-30 16:52:07 +07: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 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 |  | 
				
					
						| 
								
								
									 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 |  |