treehouse
/
mastodon
20
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/app/views/admin
History
Claire 656a41db2a Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream has updated its README, we have a completely different one.
  Kept ours.
- `app/views/auth/sessions/two_factor.html.haml`:
  Upstream refactored stuff and the conflict is because of glitch-soc's theming
  system.
  Ported upstream changes while accounting for the different theming system.
 		2023-10-17 20:59:18 +02:00
..
account_actions Fix more haml-lint Rubocop (#24107) 2023-03-15 20:07:43 +01:00
account_warnings Fix crash when viewing a moderation appeal and the moderator account has been deleted (#25900) 2023-09-18 17:41:32 +02:00
accounts Fix haml-lint Rubocop `Rails/*` cops (#26042) 2023-10-03 15:00:40 +02:00
action_logs Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
announcements Fix haml-lint Rubocop `Rails/*` cops (#26042) 2023-10-03 15:00:40 +02:00
change_emails Fix more haml-lint Rubocop (#24107) 2023-03-15 20:07:43 +01:00
custom_emojis Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
dashboard Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
disputes/appeals Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
domain_allows Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
domain_blocks Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
email_domain_blocks Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02: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 Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
follow_recommendations Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
instances Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
invites Fix haml-lint `InstanceVariables` rule for invites/_form (#26064) 2023-09-28 15:40:28 +02:00
ip_blocks Consolidate inclusion of `admin` js pack link (#26628) 2023-08-24 09:56:23 +02:00
relationships Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
relays Update haml-lint 0.49.1 (#26118) 2023-07-23 17:48:16 +02:00
report_notes Change account moderation notes to make links clickable (#22553) 2023-01-18 16:32:23 +01:00
reports Fix haml-lint `InstanceVariables` rule for admin/reports/actions (#27339) 2023-10-11 15:58:33 +02:00
roles Fix haml-lint `InstanceVariables` rule for admin/roles/_form (#26063) 2023-09-28 16:36:24 +02:00
rules Setup haml-lint CI with todo config (#23524) 2023-03-15 04:15:36 +01:00
settings Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream 2023-09-02 14:44:47 +02:00
software_updates Add admin notifications for new Mastodon versions (#26582) 2023-09-01 17:47:07 +02: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 Fix haml-lint Rubocop `Rails/*` cops (#26042) 2023-10-03 15:00:40 +02:00
tags Fix haml-lint Rubocop `Rails/*` cops (#26042) 2023-10-03 15:00:40 +02:00
trends Link to hashtag timelines from the Trending hashtags moderation interface (#26724) 2023-09-06 17:49:52 +02:00
users/roles Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
warning_presets Setup haml-lint CI with todo config (#23524) 2023-03-15 04:15:36 +01:00
webhooks Fix haml-lint `InstanceVariables` rule for admin/webhooks/_form (#26062) 2023-09-28 16:23:35 +02:00