Claire 077183a121 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/settings/preferences_controller.rb`: Upstream dropping `digest` from notifications emails while we have more notification emails settings. Removed `digest` from our list while keeping our extra settings. - `app/javascript/packs/admin.js`: Conflicts caused by glitch-soc's theming system. Applied the changes to `app/javascript/core/admin.js`. - `app/views/settings/preferences/other/show.html.haml`: Upstream removed a setting close to a glitch-soc-only setting. Applied upstream's change.		2022-08-28 11:31:00 +02:00
..
trends	Refactor formatter (#17828)	2022-03-26 02:53:34 +01:00
account_moderation_notes_helper.rb	Add appeals (#17364)	2022-02-14 21:27:53 +01:00
action_logs_helper.rb	Add admin API for managing canonical e-mail blocks (#19067)	2022-08-28 03:31:54 +02:00
announcements_helper.rb
dashboard_helper.rb	Fix admin interface crash when displaying deleted user (#17301)	2022-01-16 20:57:37 +01:00
filter_helper.rb	Add trending statuses (#17431)	2022-02-25 00:34:14 +01:00
settings_helper.rb	Add optional hCaptcha support	2022-01-24 21:22:13 +01:00