Claire 6c20dad201 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js`		2023-01-05 14:16:25 +01:00
..
disputes	Add appeals (#17364)	2022-02-14 21:27:53 +01:00
reports	Add ability to mark statuses as sensitive from reports in admin UI (#17668)	2022-03-01 22:20:29 +01:00
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	Add audit log entries for user roles (#19040)	2022-08-25 20:39:40 +02:00
webhooks	Add administrative webhooks (#18510)	2022-06-09 21:57:36 +02:00
account_actions_controller.rb	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
account_moderation_notes_controller.rb	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +01:00
accounts_controller.rb	Log admin approve and reject account (#22088)	2022-12-07 00:25:18 +01:00
action_logs_controller.rb	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
announcements_controller.rb
base_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-07-05 09:33:44 +02:00
change_emails_controller.rb
confirmations_controller.rb	Fix inaccurate admin log entry for re-sending confirmation e-mails (#19674)	2022-11-02 18:50:21 +01:00
custom_emojis_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
dashboard_controller.rb	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
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	Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)	2022-11-17 11:05:09 +01:00
export_domain_allows_controller.rb	Fix various issues with domain block import (#1944)	2022-11-17 11:42:20 +01:00
export_domain_blocks_controller.rb	Fix various issues with domain block import (#1944)	2022-11-17 11:42:20 +01:00
follow_recommendations_controller.rb	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
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	Fix IP blocks not having a unique index (#19456)	2022-10-25 21:43:44 +02:00
relationships_controller.rb	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
relays_controller.rb	Allow adding relays while secure mode & limited federation mode are enabled (#22324)	2022-12-15 15:56:05 +01:00
report_notes_controller.rb	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +01:00
reports_controller.rb	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +01:00
resets_controller.rb
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	Change settings area to be separated into categories in admin UI (#19407)	2022-10-22 11:44:41 +02:00
site_uploads_controller.rb	Change settings area to be separated into categories in admin UI (#19407)	2022-10-22 11:44:41 +02:00
statuses_controller.rb	Add ability to view previous edits of a status in admin UI (#19462)	2022-10-26 13:42:29 +02:00
tags_controller.rb	Change how hashtags are normalized (#18795)	2022-07-13 15:03:28 +02:00
warning_presets_controller.rb
webhooks_controller.rb	Add administrative webhooks (#18510)	2022-06-09 21:57:36 +02:00