monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/controllers/admin
History
Claire 8c26d49cbd Merge commit '16dd3f08c1e5396d5f9ff3f13417901bc4e4b8b9' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream fixed a translation bug in the theme selector that is absent from
  glitch-soc due to our different theming system.
  Discarded upstream changes.
- `streaming/index.js`:
  Upstream changed the signature of a function to change its return type.
  This is not a real conflict, the conflict being caused by an extra
  argument in glitch-soc's code.
  Applied upstream's change while keeping our extra argument.
 		2023-06-10 17:18:36 +02:00
..
disputes Add appeals (#17364) 2022-02-14 21:27:53 +01:00
reports Add confirmation screen when handling reports (#22375) 2023-01-18 16:40:09 +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 confirmation screen when handling reports (#22375) 2023-01-18 16:40:09 +01: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 Fix Rails/ActionOrder cop (#24692) 2023-04-30 06:46:39 +02:00
base_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +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 Remove unused `redis_info` method Admin::Dashboard (#25345) 2023-06-09 14:03:35 +02:00
domain_allows_controller.rb
…
domain_blocks_controller.rb Add a confirmation screen when suspending a domain (#25144) 2023-06-01 09:37:38 +02:00
email_domain_blocks_controller.rb Remove references to non-existent actions (#24183) 2023-03-20 20:03:44 +01:00
export_domain_allows_controller.rb Change domain block CSV parsing to be more robust and handle more lists (#21470) 2023-01-18 16:20:52 +01:00
export_domain_blocks_controller.rb Change domain block CSV parsing to be more robust and handle more lists (#21470) 2023-01-18 16:20:52 +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 Add ability to skip sign-in token authentication for specific users (#16427) 2021-07-08 05:31:28 +02:00
roles_controller.rb Fix Rails/ActionOrder cop (#24692) 2023-04-30 06:46:39 +02:00
rules_controller.rb Fix Rails/ActionOrder cop (#24692) 2023-04-30 06:46:39 +02:00
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 Fix Rails/ActionOrder cop (#24692) 2023-04-30 06:46:39 +02:00
webhooks_controller.rb Add webhook templating (#23289) 2023-06-06 10:42:47 +02:00