tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
0ad919b192
mastodon/app/controllers/admin
History
Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.
2022-11-06 09:50:41 +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 Change settings area to be separated into categories in admin UI (#19407) 2022-10-22 11:44:41 +02: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 Add ability to select all accounts matching search for batch actions (#19053) 2022-08-25 23:33:34 +02:00
action_logs_controller.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
announcements_controller.rb Change order of announcements in admin page to sort them newest-first (#15091) 2020-11-04 21:15:22 +01:00
base_controller.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
change_emails_controller.rb Feature: Allow staff to change user emails (#7074) 2018-04-10 09:16:06 +02:00
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 Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
domain_blocks_controller.rb Fix authorization check in domain blocks controller 2022-07-05 11:57:30 +02:00
email_domain_blocks_controller.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
export_domain_allows_controller.rb Allow import/export of instance-level domain blocks/allows (#1754) 2022-05-16 09:29:01 +02:00
export_domain_blocks_controller.rb Fix domain block export not exporting blocks with only media rejection 2022-10-28 20:14:25 +02:00
follow_recommendations_controller.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
instances_controller.rb Change design of federation pages in admin UI (#17704) 2022-03-09 08:52:32 +01:00
invites_controller.rb Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
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 Fix relays UI being available in whitelist/secure mode (#11963) 2019-09-27 02:13:34 +02: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 Add audit log entries for user roles (#19040) 2022-08-25 20:39:40 +02:00
rules_controller.rb Add server rules (#15769) 2021-02-21 19:50:12 +01: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 Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
webhooks_controller.rb Add administrative webhooks (#18510) 2022-06-09 21:57:36 +02:00