mastodon-docker-playground/app/controllers
David Yip 2ca965c704
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	app/javascript/styles/mastodon/components.scss
	app/javascript/styles/mastodon/modal.scss
2018-01-19 15:22:10 -06:00
..
activitypub Revert #5772 (#6221) 2018-01-08 10:57:52 +01:00
admin Merge remote-tracking branch 'origin/master' into merge-upstream 2017-12-30 17:20:07 -06:00
api Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-17 18:37:09 -06:00
auth Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-01-03 04:17:11 +00:00
concerns Fix regeneration marker not expiring (#6290) 2018-01-18 20:29:56 +01:00
oauth change pack to 'auth' 2017-12-11 18:14:41 -06:00
settings Thank you, Officer Murphy 2018-01-10 12:10:43 -06:00
well_known Make host_meta/webfinger replies cacheable (fixes #6100) (#6101) 2017-12-27 18:21:12 +01:00
about_controller.rb Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
account_follow_controller.rb
account_unfollow_controller.rb
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 'personal/merge/tootsuite/master' into gs-master 2018-01-07 13:30:52 -06:00
authorize_follows_controller.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-02 00:11:41 -06: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
invites_controller.rb Use settings pack for InvitesController (#229) 2017-12-06 17:20:04 -06:00
manifests_controller.rb
media_controller.rb
media_proxy_controller.rb
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 glitchsoc/master 2018-01-04 23:17:11 +00:00
stream_entries_controller.rb Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
tags_controller.rb Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00