Thibaut Girka 246c313d45 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.		2018-08-24 15:10:34 +02:00
..
account_moderation_notes_controller.rb
accounts_controller.rb
action_logs_controller.rb
base_controller.rb	Fix statuses batch checkboxes in admin panel (fixes #411)	2018-08-11 15:45:12 +02:00
change_emails_controller.rb
confirmations_controller.rb	Add resend confirmation for admin (#7378)	2018-05-06 10:59:03 +02:00
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
email_domain_blocks_controller.rb
instances_controller.rb
invites_controller.rb	Add admin function to deactivate all invites (#8279)	2018-08-19 00:58:53 +02:00
relays_controller.rb	Add federation relay support (#7998)	2018-07-13 02:16:06 +02:00
report_notes_controller.rb
reported_statuses_controller.rb	Improve admin UI for accounts (#7360)	2018-05-05 23:06:29 +02:00
reports_controller.rb	Add confirmation step to account suspensions (#8353)	2018-08-22 11:53:41 +02:00
resets_controller.rb
roles_controller.rb
settings_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-24 15:10:34 +02:00
silences_controller.rb
statuses_controller.rb	Do not error out when performing admin actions on no statuses (#8220)	2018-08-16 20:02:52 +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