Thibaut Girka 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.		2019-03-20 13:54:00 +01:00
..
account_actions_controller.rb	Redirect to reports overview instead of report after account action (#9639)	2018-12-27 03:42:29 +01:00
account_moderation_notes_controller.rb	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
accounts_controller.rb	Do not distribute Delete when rejecting unapproved accounts (#10321)	2019-03-19 16:33:30 +01:00
action_logs_controller.rb
base_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-18 16:55:15 +01:00
change_emails_controller.rb
confirmations_controller.rb	Move #set_user to Admin::BaseController (#9470)	2018-12-17 11:40:51 +01:00
custom_emojis_controller.rb	Randomize emoji filename (#10090)	2019-02-22 16:52:04 +01:00
dashboard_controller.rb	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
domain_blocks_controller.rb	Redesign admin instances area (#9645)	2019-01-08 13:39:49 +01:00
email_domain_blocks_controller.rb
followers_controller.rb	Fix list of local followers showing remote followers in admin UI (#9700)	2019-01-03 06:40:16 +01:00
instances_controller.rb	Add domain search/filter to the "Federation" (/admin/instances) page (#10071)	2019-02-18 14:59:19 +01:00
invites_controller.rb
relays_controller.rb
report_notes_controller.rb
reported_statuses_controller.rb	Do not error out when performing admin actions on no statuses (#10094)	2019-02-21 19:36:48 +01:00
reports_controller.rb	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
resets_controller.rb	Move #set_user to Admin::BaseController (#9470)	2018-12-17 11:40:51 +01:00
roles_controller.rb	Move #set_user to Admin::BaseController (#9470)	2018-12-17 11:40:51 +01:00
settings_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-14 17:17:20 +01:00
statuses_controller.rb	Add quick links to the admin interface in the WebUI (#8545)	2019-01-04 13:10:43 +01:00
subscriptions_controller.rb
tags_controller.rb	Fix Admin::TagsController#unhide (#9481)	2018-12-10 21:37:38 +01:00
two_factor_authentications_controller.rb	Move #set_user to Admin::BaseController (#9470)	2018-12-17 11:40:51 +01:00
warning_presets_controller.rb	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00