Thibaut Girka f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).		2018-11-27 13:23:02 +01:00
..
account_moderation_notes_controller.rb
accounts_controller.rb	Redesign admin accounts index (#9340)	2018-11-26 15:53:27 +01:00
action_logs_controller.rb	Add logging of admin actions (#5757)	2017-11-24 02:05:53 +01:00
base_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-26 20:41:43 +02:00
change_emails_controller.rb
confirmations_controller.rb
custom_emojis_controller.rb
dashboard_controller.rb	Display trending hashtags on admin dashboard (#8038)	2018-07-16 19:21:27 +02:00
domain_blocks_controller.rb	Add option to block reports from domain (#8830)	2018-10-20 08:02:44 +02:00
email_domain_blocks_controller.rb
instances_controller.rb	Extract counters from accounts table to account_stats table (#9295)	2018-11-19 00:43:52 +01:00
invites_controller.rb	Add admin function to deactivate all invites (#8279)	2018-08-19 00:58:53 +02:00
relays_controller.rb
report_notes_controller.rb
reported_statuses_controller.rb
reports_controller.rb	Add "disable" button to report screen (#9024)	2018-10-20 02:39:39 +02:00
resets_controller.rb
roles_controller.rb
settings_controller.rb	Allow selecting both default flavour and theme	2018-10-12 19:06:35 +02:00
silences_controller.rb
statuses_controller.rb	Allow to show a specific status in the admin interface	2018-09-03 18:19:11 +02:00
subscriptions_controller.rb
suspensions_controller.rb	Fix regression when suspending not from report (#8400)	2018-08-23 21:51:56 +02:00
two_factor_authentications_controller.rb