| 
								
								
									 Ivan Tashkinov | 00e62161f6 | [#2409] Tested all auth setup configs in AuthTestControllerTest. Adjusted :skip_plug definitions for some endpoints. | 2020-04-24 16:52:38 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 6da6540036 | Bump copyright years of files changed after 2020-01-07 Done via the following command:
git diff fcd5dd259a--stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>' | 2020-03-02 06:08:45 +01:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 455e072d27 | [#2068] Introduced proper OAuth tokens usage to controller tests. | 2019-12-19 17:23:27 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | e0c68eeb02 | Move :favouritesand:bookmarksactions to StatusController | 2019-10-02 21:31:19 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 7f2bc57725 | Move follows,mutesandblocksactions to AccountController | 2019-10-02 21:22:21 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | d3c404af12 | Add MastoFEController | 2019-10-02 20:36:08 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 1c6e1055c8 | Add CustomEmojiController | 2019-10-02 19:16:34 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | c8b01f6667 | Extract instance actions from MastodonAPIControllertoInstanceController | 2019-10-02 14:13:52 +07:00 |  | 
				
					
						| 
								
								
									 kaniini | 8557176808 | Merge branch 'split-masto-api/auth' into 'develop' Extract auth actions from `MastodonAPIController` to `AuthController`
See merge request pleroma/pleroma!1759 | 2019-10-02 07:02:56 +00:00 |  | 
				
					
						| 
								
								
									 feld | 1255ec888d | Revert "Add upload limits to /api/v1/instance" This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa. | 2019-10-01 22:16:29 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | af690d1033 | Extract auth actions from MastodonAPIControllertoAuthController | 2019-10-01 15:54:45 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 2dad6dd020 | Extract apps actions from MastodonAPIControllertoAppController | 2019-10-01 15:21:46 +07:00 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 0c6009dd2e | Extract mascot actions from MastodonAPIControllerto MascotController | 2019-09-30 19:32:43 +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 | 122cc050ab | Move account_lists test to MastodonAPI.AccountControllerTest | 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 |  | 
				
					
						| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | 1053319cd6 | Merge branch 'develop' into tests/mastodon_api_controller.ex | 2019-09-28 10:36:04 +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 | 76b7e5cd5b | Move StatusController tests from MastodonAPIControllerTest to StatusControllerTest | 2019-09-27 10:52:47 +07: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 MastodonAPIControllerintoTimelineController | 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 |  | 
				
					
						| 
								
								
									 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 MastodonAPIControllerintoNotificationController | 2019-09-24 15:16:44 +07:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | d75d0ae134 | Merge branch 'develop' into tests/mastodon_api_controller.ex | 2019-09-24 08:06:04 +03:00 |  | 
				
					
						| 
								
								
									 kaniini | 19263f30c3 | Merge branch 'support-rel-ugc' into 'develop' Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679 | 2019-09-23 22:41:31 +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 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 95c948110c | Add rel="ugc"to hashtags and mentions | 2019-09-19 14:56:10 +07:00 |  | 
				
					
						| 
								
								
									 eugenijm | fe5e0b7846 | Mastodon API: Return pleroma.direct_conversation_idwhen creating direct messages (POST /api/v1/statuses) | 2019-09-19 08:59:25 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | ca88e37a8f | Fix a race condition in tests | 2019-09-16 12:55:05 +07:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 610236d6be | [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue # Conflicts:
#	docs/config.md | 2019-09-15 10:12:24 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 6bcedb693c | [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue # Conflicts:
#	docs/config.md
#	mix.lock | 2019-09-14 16:11:44 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | a78a7ee455 | Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs | 2019-09-14 10:50:08 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 85b6144ffd | Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs | 2019-09-14 10:46:35 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 5c5ebd3861 | Mastodon API: Respect post privacy in favourited/reblogged endpoints | 2019-09-14 01:50:15 +03:00 |  |