mastodon/app/controllers
David Yip 4c1fd9a19c
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
Conflicts:
      app/javascript/styles/mastodon/components.scss
..
activitypub Allow retrieval of private statuses (single or in outbox) using HTTP signatures ()
admin Merge remote-tracking branch 'origin/master' into merge-upstream
api Merge remote-tracking branch 'origin/master' into merge-upstream
auth Merge remote-tracking branch 'tootsuite/master' into merge-upstream
concerns Allow retrieval of private statuses (single or in outbox) using HTTP signatures ()
oauth change pack to 'auth'
settings Merge remote-tracking branch 'origin/master' into merge-upstream
well_known Make host_meta/webfinger replies cacheable (fixes ) ()
about_controller.rb Finalized theme loading and stuff
account_follow_controller.rb Restful refactor of accounts/ routes ()
account_unfollow_controller.rb Restful refactor of accounts/ routes ()
accounts_controller.rb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
application_controller.rb Merge remote-tracking branch 'tootsuite/master' into merge-upstream
authorize_follows_controller.rb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
emojis_controller.rb Cache JSON of immutable ActivityPub representations ()
follower_accounts_controller.rb Finalized theme loading and stuff
following_accounts_controller.rb Finalized theme loading and stuff
home_controller.rb Finalized theme loading and stuff
intents_controller.rb Add protocol handler. Handle follow intents ()
invites_controller.rb Use settings pack for InvitesController ()
manifests_controller.rb Make Chrome splash screen same color as web UI's background color ()
media_controller.rb Extract authorization policy for viewing statuses ()
media_proxy_controller.rb Fix incomplete account records being read ()
remote_follow_controller.rb Merge remote-tracking branch 'origin/master' into merge-upstream
shares_controller.rb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
statuses_controller.rb Merge remote-tracking branch 'tootsuite/master' into merge-upstream
stream_entries_controller.rb Merge remote-tracking branch 'tootsuite/master' into merge-upstream
tags_controller.rb Finalized theme loading and stuff