mastodon/app/controllers
David Yip 020b40efdb
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	.travis.yml
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_detailed_status.html.haml
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
2018-02-09 09:25:53 -06:00
..
activitypub Fix response of signature_verification_failure_reason (#6441) 2018-02-08 05:00:45 +01:00
admin Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-04 16:36:19 -06:00
api Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-02-08 23:17:14 +00:00
auth Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-04 16:36:19 -06:00
concerns Allow retrieval of private statuses (single or in outbox) using HTTP signatures (#6225) 2018-02-02 10:19:59 +01:00
oauth change pack to 'auth' 2017-12-11 18:14:41 -06:00
settings Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-09 09:25:53 -06:00
well_known Make host_meta/webfinger replies cacheable (fixes #6100) (#6101) 2017-12-27 18:21:12 +01:00
about_controller.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-02-04 16:36:19 -06:00
account_follow_controller.rb Restful refactor of accounts/ routes (#2133) 2017-04-19 13:52:37 +02:00
account_unfollow_controller.rb Restful refactor of accounts/ routes (#2133) 2017-04-19 13:52:37 +02:00
accounts_controller.rb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-04 23:17:11 +00:00
application_controller.rb Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2018-02-02 08:39:52 -06:00
authorize_follows_controller.rb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-24 19:17:11 +00:00
emojis_controller.rb Cache JSON of immutable ActivityPub representations (#6171) 2018-01-04 01:21:38 +01:00
follower_accounts_controller.rb Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
following_accounts_controller.rb Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
home_controller.rb Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
intents_controller.rb Add protocol handler. Handle follow intents (#4511) 2017-08-14 04:53:31 +02:00
invites_controller.rb Use settings pack for InvitesController (#229) 2017-12-06 17:20:04 -06:00
manifests_controller.rb Make Chrome splash screen same color as web UI's background color (#5169) 2017-10-02 01:23:32 +02:00
media_controller.rb Extract authorization policy for viewing statuses (#3150) 2017-05-29 18:22:22 +02:00
media_proxy_controller.rb Fix incomplete account records being read (#4998) 2017-09-19 06:53:16 +02:00
remote_follow_controller.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-02 00:11:41 -06:00
shares_controller.rb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-17 16:17:10 +00:00
statuses_controller.rb Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2018-02-02 08:39:52 -06:00
stream_entries_controller.rb Merge remote-tracking branch 'tootsuite/master' into merge-upstream 2018-02-02 08:39:52 -06:00
tags_controller.rb Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00