mastodon/app/views/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 Add moderator role and add pundit policies for admin actions (#5635) 2017-11-11 20:23:33 +01:00
accounts Feature: add count of account notes to reports (#7130) 2018-04-17 14:58:11 +02:00
action_logs Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
change_emails Feature: Allow staff to change user emails (#7074) 2018-04-10 09:16:06 +02:00
custom_emojis keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114) 2017-12-30 02:43:43 +01:00
domain_blocks Scrollable tables in settings pages (#4857) 2017-09-09 02:26:58 +02:00
email_domain_blocks Fix style of email domain block table (#5218) 2017-10-04 18:16:30 +02:00
instances Add instance search feature (#4925) 2017-09-13 12:30:07 +02:00
invites Add invite filter (#5862) 2017-12-01 16:40:02 +01:00
report_notes Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
reports Merge remote-tracking branch 'origin/master' into gs-master 2018-05-03 17:23:44 -05:00
settings Redesign landing page (again) (#6486) 2018-02-22 01:03:48 +01:00
statuses Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
subscriptions Scrollable tables in settings pages (#4857) 2017-09-09 02:26:58 +02:00