mastodon/app/controllers
David Yip eb39db7f93
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	app/javascript/mastodon/locales/en.json
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json
 	app/views/accounts/_header.html.haml
2018-04-01 20:24:50 -05:00
..
activitypub Federate pinned statuses over ActivityPub (#6610) 2018-03-04 09:19:11 +01:00
admin Add “public” pack to admin controller, as it is included in upstream admin layout 2018-03-30 18:16:47 +02:00
api Merge remote-tracking branch 'origin/master' into gs-master 2018-04-01 20:24:50 -05:00
auth Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-09 00:17:17 +00:00
concerns If DEFAULT_LOCALE is set, enforce it instead of HTTP request locale (#6817) 2018-03-18 16:57:04 +01:00
oauth
settings Fix migration page style 2018-03-30 15:26:12 +02:00
well_known
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
accounts_controller.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
application_controller.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
authorize_follows_controller.rb
emojis_controller.rb
follower_accounts_controller.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
following_accounts_controller.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-03-02 21:46:44 -06:00
home_controller.rb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-09 00:17:17 +00:00
intents_controller.rb Add protocol handler. Handle follow intents (#4511) 2017-08-14 04:53:31 +02:00
invites_controller.rb
manifests_controller.rb
media_controller.rb Save video metadata and improve video OpenGraph tags (#6481) 2018-02-16 07:22:20 +01:00
media_proxy_controller.rb
remote_follow_controller.rb
shares_controller.rb
statuses_controller.rb
stream_entries_controller.rb
tags_controller.rb Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00