You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Egor Kislitsyn 4c1dd55c48 Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships		5 years ago
..
account_controller	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	5 years ago
account_controller_test.exs	Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships	5 years ago
app_controller_test.exs	Extract apps actions from `MastodonAPIController` to `AppController`	5 years ago
auth_controller_test.exs	Extract auth actions from `MastodonAPIController` to `AuthController`	5 years ago
conversation_controller_test.exs	[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation	5 years ago
custom_emoji_controller_test.exs	Add CustomEmojiController	5 years ago
domain_block_controller_test.exs	Disable async in DomainBlockControllerTest	5 years ago
filter_controller_test.exs	Extract filter actions from `MastodonAPIController` to `FilterController`	5 years ago
follow_request_controller_test.exs	Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships	5 years ago
instance_controller_test.exs	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	5 years ago
list_controller_test.exs	Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests	5 years ago
marker_controller_test.exs	add Markers /api/v1/markers	5 years ago
media_controller_test.exs	Extract media actions from `MastodonAPIController` to `MediaController`	5 years ago
notification_controller_test.exs	Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints	5 years ago
poll_controller_test.exs	Extract poll actions from `MastodonAPIController` to `PollController`	5 years ago
report_controller_test.exs	Fix ReportControllerTest	5 years ago
scheduled_activity_controller_test.exs	Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`	5 years ago
search_controller_test.exs	tests: mastodon search: search for an account that is visible via activitypub, not ostatus	5 years ago
status_controller_test.exs	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	5 years ago
subscription_controller_test.exs	Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers and test/web/mastodon_api/views	5 years ago
suggestion_controller_test.exs	Extract suggestions actions from `MastodonAPIController` to `SuggestionController`	5 years ago
timeline_controller_test.exs	kill almost all of the OStatus module	5 years ago