monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/views/admin
History
Claire bceb45adda Merge commit '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/entrypoints/common.js`:
  Upstream moved everything from `app/javascript/packs` to
  `app/javascript/entrypoints` while this file was a glitch-soc
  addition. Moved it like the rest.
- `tsconfig.json`:
  Conflict due to glitch-soc's flavor.
  Updated like upstream.

Also moved and updated the following files accordingly:
- `app/javascript/flavours/vanilla/theme.yml`
- `app/javascript/flavours/glitch/theme.yml`
- everything in `app/javascript/flavours/glitch/packs`
 		2024-05-04 14:59:00 +02:00
..
account_actions
…
account_warnings Add material design icons to admin/settings views (#27780) 2024-04-23 16:43:49 +00:00
accounts Add material design icons to admin/settings views (#27780) 2024-04-23 16:43:49 +00:00
action_logs
…
announcements Use shared `form` partial for `admin/announcements` views (#29608) 2024-04-19 13:57:32 +00:00
change_emails
…
custom_emojis Merge commit '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream 2024-05-04 14:59:00 +02:00
dashboard Add material design icons to admin/settings views (#27780) 2024-04-23 16:43:49 +00:00
disputes/appeals
…
domain_allows
…
domain_blocks Use shared `form` partial for `admin/domain_blocks` views (#29609) 2024-04-22 12:22:16 +00:00
email_domain_blocks Add material design icons to admin/settings views (#27780) 2024-04-23 16:43:49 +00:00
export_domain_allows
…
export_domain_blocks Add material design icons to admin/settings views (#27780) 2024-04-23 16:43:49 +00:00
follow_recommendations Add material design icons to admin/settings views (#27780) 2024-04-23 16:43:49 +00:00
instances Add material design icons to admin/settings views (#27780) 2024-04-23 16:43:49 +00:00
invites Add material design icons to admin/settings views (#27780) 2024-04-23 16:43:49 +00:00
ip_blocks Add material design icons to admin/settings views (#27780) 2024-04-23 16:43:49 +00:00
relationships Add material design icons to admin/settings views (#27780) 2024-04-23 16:43:49 +00:00
relays Add material design icons to admin/settings views (#27780) 2024-04-23 16:43:49 +00:00
report_notes
…
reports Add material design icons to admin/settings views (#27780) 2024-04-23 16:43:49 +00:00
roles Add material design icons to admin/settings views (#27780) 2024-04-23 16:43:49 +00:00
rules Fix admin interface repeating rule title instead of showing hint text (#29758) 2024-03-26 14:46:05 +00:00
settings Merge commit '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream 2024-05-04 14:59:00 +02:00
software_updates
…
status_edits Add material design icons to admin/settings views (#27780) 2024-04-23 16:43:49 +00:00
statuses Add material design icons to admin/settings views (#27780) 2024-04-23 16:43:49 +00:00
tags Add material design icons to admin/settings views (#27780) 2024-04-23 16:43:49 +00:00
trends Add material design icons to admin/settings views (#27780) 2024-04-23 16:43:49 +00:00
users/roles
…
warning_presets
…
webhooks
…