monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/views/admin
History
Claire dd2a991e24 Merge commit '079d681ac6f279f3a7a6be5c3734549f3be8f912' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/material-icons/400-24px/code.svg`:
  Icon newly-introduced upstream.
  Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/mail.svg`:
  Icon newly-introduced upstream.
  Used upstream's more recent version.
- `app/javascript/material-icons/400-24px/manufacturing.svg`:
  Icon newly-introduced upstream.
  Used upstream's more recent version.
- `app/views/admin/settings/shared/_links.html.haml`:
  Glitch-soc had extra menu items, ported the changes for them too.
- `config/navigation.rb`:
  Glitch-soc had extra menu items, ported the changes for them too.
 		2024-08-08 19:30:16 +02:00
..
account_actions
…
account_warnings
…
accounts Convert `form_for` -> `form_with` in views (#30700) 2024-06-14 09:54:22 +00:00
action_logs Migrate `form_tag` to `form_with` in admin and auth views (#30692) 2024-06-14 09:49:10 +00:00
announcements
…
change_emails
…
custom_emojis Merge commit '079d681ac6f279f3a7a6be5c3734549f3be8f912' into glitch-soc/merge-upstream 2024-08-08 19:30:16 +02:00
dashboard
…
disputes/appeals
…
domain_allows
…
domain_blocks
…
email_domain_blocks Convert `form_for` -> `form_with` in views (#30700) 2024-06-14 09:54:22 +00: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 Convert `form_for` -> `form_with` in views (#30700) 2024-06-14 09:54:22 +00:00
instances Replace more `font-awesome` icons in `views/admin` area (#30961) 2024-08-07 23:08:36 +00:00
invites
…
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 Replace more `font-awesome` icons in `views/admin` area (#30961) 2024-08-07 23:08:36 +00:00
report_notes
…
reports Replace more `font-awesome` icons in `views/admin` area (#30961) 2024-08-07 23:08:36 +00:00
roles Recolor Preferences/Admin UI to better match main design (#31034) 2024-07-23 15:30:45 +00:00
rules
…
settings Merge commit '079d681ac6f279f3a7a6be5c3734549f3be8f912' into glitch-soc/merge-upstream 2024-08-08 19:30:16 +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 Implement UI for Admin Search of Hashtags (#30880) 2024-07-29 15:49:44 +00:00
trends Implement UI for Admin Search of Hashtags (#30880) 2024-07-29 15:49:44 +00:00
users/roles
…
warning_presets
…
webhooks Replace more `font-awesome` icons in `views/admin` area (#30961) 2024-08-07 23:08:36 +00:00