mastodon/app/views/admin
Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
  Port upstream's minor refactoring
2022-12-15 20:25:25 +01:00
..
account_actions Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
account_warnings Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
accounts Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
action_logs Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
announcements Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 08:35:55 +01:00
change_emails Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
custom_emojis Merge branch 'main' into glitch-soc/merge-upstream 2022-06-11 00:08:41 +02:00
dashboard Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
disputes/appeals Merge branch 'main' into glitch-soc/merge-upstream 2022-03-22 17:00:38 +01:00
domain_allows
domain_blocks Merge branch 'main' into glitch-soc/merge-upstream 2022-03-10 09:52:45 +01:00
email_domain_blocks Adapt view for glitch-soc's theming system 2022-02-26 09:46:13 +01:00
export_domain_allows 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_blocks Fix missing Javascript in domain block import confirmation page (#21471) 2022-12-15 15:47:23 +01:00
follow_recommendations Merge branch 'main' into glitch-soc/merge-upstream 2022-02-26 09:29:23 +01:00
instances 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
invites
ip_blocks
relationships Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
relays
report_notes Render current day formats in the client timezone (#21878) 2022-12-15 16:35:25 +01:00
reports Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
roles Use type="color" on badge color input field (#18825) 2022-08-25 04:38:34 +02:00
rules
settings Merge branch 'main' into glitch-soc/merge-upstream 2022-12-11 20:15:04 +01:00
status_edits Add ability to view previous edits of a status in admin UI (#19462) 2022-10-26 13:42:29 +02:00
statuses Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
tags Merge branch 'main' into glitch-soc/merge-upstream 2022-07-17 22:07:20 +02:00
trends Merge branch 'main' into glitch-soc/merge-upstream 2022-10-28 19:23:58 +02:00
users/roles Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
warning_presets
webhooks Add administrative webhooks (#18510) 2022-06-09 21:57:36 +02:00