Thibaut Girka 5bb8563f6c Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.		2018-10-26 20:41:43 +02:00
..
account_moderation_notes_controller.rb
accounts_controller.rb	Change admin accounts default sort to most recent (#8813)	2018-10-04 16:05:38 +02:00
action_logs_controller.rb
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	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	Add option to block reports from domain (#8830)	2018-10-20 08:02:44 +02:00
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 "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