mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity
donphan/app/views/admin
History
Claire 0d69cc068c Merge commit '26f25ef4bafd5ad84d03d8cb7ad0d868360175e5' into glitch-soc/stable-4.3 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict caused by glitch-soc changing the path to images, and upstream
  removing styling using such an image.
  Removed the styling as upstream did.
- `app/models/trends/statuses.rb`:
  Upstream added a date restriction to trendable posts, while glitch-soc had
  slightly different conditions.
  Added the date restriction to glitch-soc's conditions.
 		2024-12-02 21:49:12 +01:00
..
account_actions Fix inability to locally suspend remotely-suspended accounts in moderation interface (#31899) 2024-09-13 09:11:10 +00:00
account_warnings
…
accounts Convert `admin/reset` controller spec to system spec (#31643) 2024-08-29 08:38:17 +00:00
action_logs Move admin action log type list generation to helper (#32178) 2024-10-04 17:48:03 +02:00
announcements Use `async_count` in more view locations (#32086) 2024-12-02 16:20:32 +01:00
change_emails
…
custom_emojis Merge commit '079d681ac6f279f3a7a6be5c3734549f3be8f912' into glitch-soc/merge-upstream 2024-08-08 19:30:16 +02:00
dashboard Add `date_range` view helper (#32187) 2024-10-04 17:48:03 +02:00
disputes/appeals Use `async_count` in more view locations (#32086) 2024-12-02 16:20:32 +01:00
domain_allows
…
domain_blocks
…
email_domain_blocks Only show email domain blocks MX table when some found (#32155) 2024-10-04 17:48:03 +02:00
export_domain_allows
…
export_domain_blocks Convert `form_for` -> `form_with` in views (#30700) 2024-06-14 09:54:22 +00:00
follow_recommendations Move Follow Recommendations to Trends menu, rename to Recommendations & Trends (#31292) 2024-08-10 09:17:10 +00:00
instances Add `date_range` view helper (#32187) 2024-10-04 17:48:03 +02:00
invites Convert `admin/invites` controller specs to system specs (#32450) 2024-10-16 12:40:58 +02:00
ip_blocks Convert `form_for` -> `form_with` in views (#30700) 2024-06-14 09:54:22 +00:00
relationships Convert `form_for` -> `form_with` in views (#30700) 2024-06-14 09:54:22 +00:00
relays Use material symbols in table link helper (#31359) 2024-08-20 11:48:15 +00:00
report_notes Use material symbols in table link helper (#31359) 2024-08-20 11:48:15 +00:00
reports Fix links for reblogs in moderation interface (#31979) 2024-09-20 13:33:26 +00:00
roles Use material symbols in table link helper (#31359) 2024-08-20 11:48:15 +00:00
rules Use material symbols in table link helper (#31359) 2024-08-20 11:48:15 +00:00
settings Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream 2024-09-29 11:06:09 +02:00
software_updates
…
status_edits
…
statuses Replace more `font-awesome` icons in `views/admin` area (#30961) 2024-08-07 23:08:36 +00:00
tags Add `date_range` view helper (#32187) 2024-10-04 17:48:03 +02:00
trends Use `async_count` in more view locations (#32086) 2024-12-02 16:20:32 +01:00
users/roles Add link to `/admin/roles` in moderation interface when changing someone's role (#31791) 2024-09-06 17:21:49 +00:00
warning_presets Use material symbols in table link helper (#31359) 2024-08-20 11:48:15 +00:00
webhooks Wrap webhook event label with `samp` tag (#32115) 2024-09-27 08:20:21 +00:00