mastodon/app/controllers/admin
David Yip c816701550
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	.travis.yml
 	Gemfile.lock
 	README.md
 	app/controllers/settings/follower_domains_controller.rb
 	app/controllers/statuses_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/lib/feed_manager.rb
 	app/models/media_attachment.rb
 	app/models/mute.rb
 	app/models/status.rb
 	app/services/mute_service.rb
 	app/views/home/index.html.haml
 	app/views/stream_entries/_simple_status.html.haml
 	config/locales/ca.yml
 	config/locales/en.yml
 	config/locales/es.yml
 	config/locales/fr.yml
 	config/locales/nl.yml
 	config/locales/pl.yml
 	config/locales/pt-BR.yml
 	config/themes.yml
2018-05-03 17:23:44 -05:00
..
account_moderation_notes_controller.rb
accounts_controller.rb Implement the ability for an Administrator or Moderator to remove an account avatar (#6998) 2018-04-02 13:45:07 +02:00
action_logs_controller.rb
base_controller.rb Add “public” pack to admin controller, as it is included in upstream admin layout 2018-03-30 18:16:47 +02:00
change_emails_controller.rb Feature: Allow staff to change user emails (#7074) 2018-04-10 09:16:06 +02:00
confirmations_controller.rb
custom_emojis_controller.rb keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114) 2017-12-30 02:43:43 +01:00
domain_blocks_controller.rb
email_domain_blocks_controller.rb
instances_controller.rb
invites_controller.rb
report_notes_controller.rb Feature: Improve reports ui (#7032) 2018-04-10 20:27:59 +02:00
reported_statuses_controller.rb Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
reports_controller.rb Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
resets_controller.rb
roles_controller.rb
settings_controller.rb Redesign landing page (again) (#6486) 2018-02-22 01:03:48 +01:00
silences_controller.rb
statuses_controller.rb Prevent admins and moderators eavesdropping in private and direct toots (#7067) 2018-04-07 21:33:01 +02:00
subscriptions_controller.rb
suspensions_controller.rb
two_factor_authentications_controller.rb