Ivan Tashkinov ee04fbc35a [#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation ... # Conflicts: # CHANGELOG.md # lib/pleroma/notification.ex # lib/pleroma/user.ex # lib/pleroma/user/info.ex # lib/pleroma/web/admin_api/admin_api_controller.ex # lib/pleroma/web/ostatus/handlers/follow_handler.ex # lib/pleroma/web/ostatus/ostatus.ex # lib/pleroma/web/salmon/salmon.ex # lib/pleroma/web/websub/websub.ex # test/web/admin_api/admin_api_controller_test.exs # test/web/federator_test.exs # test/web/mastodon_api/controllers/conversation_controller_test.exs # test/web/ostatus/ostatus_controller_test.exs # test/web/ostatus/ostatus_test.exs # test/web/salmon/salmon_test.exs # test/web/websub/websub_test.exs		2019-10-20 22:29:56 +03:00
..
account_controller	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
account_controller_test.exs	Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation	2019-10-20 20:43:18 +03:00
app_controller_test.exs	Extract apps actions from MastodonAPIController to AppController	2019-10-01 15:21:46 +07:00
auth_controller_test.exs	Extract auth actions from MastodonAPIController to AuthController	2019-10-01 15:54:45 +07:00
conversation_controller_test.exs	[#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation	2019-10-20 22:29:56 +03:00
custom_emoji_controller_test.exs	Add CustomEmojiController	2019-10-02 19:16:34 +07:00
domain_block_controller_test.exs	Disable async in DomainBlockControllerTest	2019-09-30 19:10:55 +07:00
filter_controller_test.exs	Extract filter actions from MastodonAPIController to FilterController	2019-09-27 13:06:25 +07:00
follow_request_controller_test.exs	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
instance_controller_test.exs	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
list_controller_test.exs
media_controller_test.exs	Extract media actions from MastodonAPIController to MediaController	2019-10-01 14:36:35 +07:00
notification_controller_test.exs	Mastodon API: Add exclude_visibilities parameter to the timeline and notification endpoints	2019-10-14 02:57:21 +03:00
poll_controller_test.exs	Extract poll actions from MastodonAPIController to PollController	2019-10-01 11:44:34 +07:00
report_controller_test.exs	Fix ReportControllerTest	2019-09-30 18:30:10 +07:00
scheduled_activity_controller_test.exs	Extract scheduled statuses actions from MastodonAPIController to ScheduledActivityController	2019-09-27 13:36:28 +07:00
search_controller_test.exs	tests: mastodon search: search for an account that is visible via activitypub, not ostatus	2019-10-18 14:50:10 +00:00
status_controller_test.exs	[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.	2019-10-16 21:59:21 +03:00
subscription_controller_test.exs	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
suggestion_controller_test.exs	Extract suggestions actions from MastodonAPIController to SuggestionController	2019-10-01 15:07:49 +07:00
timeline_controller_test.exs	kill almost all of the OStatus module	2019-10-18 14:50:09 +00:00