Claire 60abcb3c4c Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `config/i18n-tasks.yml`: Upstream added new ignored strings, glitch-soc has extra ignored strings because of the theming system. Added upstream's changes.		2023-01-18 17:38:11 +01:00
..
disputes
reports
settings	Add back missing glitch-soc admin settings (#1919)	2022-11-12 13:24:53 +01:00
trends	Add ability to view previous edits of a status in admin UI (#19462)	2022-10-26 13:42:29 +02:00
users
webhooks
account_actions_controller.rb
account_moderation_notes_controller.rb
accounts_controller.rb
action_logs_controller.rb
announcements_controller.rb
base_controller.rb
change_emails_controller.rb
confirmations_controller.rb
custom_emojis_controller.rb
dashboard_controller.rb
domain_allows_controller.rb
domain_blocks_controller.rb	Fix changing domain block severity not undoing individual account effects (#22135)	2022-12-15 17:45:02 +01:00
email_domain_blocks_controller.rb
export_domain_allows_controller.rb
export_domain_blocks_controller.rb
follow_recommendations_controller.rb
instances_controller.rb	Add dropdown menu item to open admin interface for remote domains (#21895)	2023-01-05 14:03:46 +01:00
invites_controller.rb
ip_blocks_controller.rb
relationships_controller.rb
relays_controller.rb
report_notes_controller.rb
reports_controller.rb
resets_controller.rb	Add ability to skip sign-in token authentication for specific users (#16427)	2021-07-08 05:31:28 +02:00
roles_controller.rb	Add audit log entries for user roles (#19040)	2022-08-25 20:39:40 +02:00
rules_controller.rb
settings_controller.rb
site_uploads_controller.rb
statuses_controller.rb
tags_controller.rb
warning_presets_controller.rb
webhooks_controller.rb