luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-07 23:44:33 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/admin
History
Claire 694c073d1f Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/admin/dashboard_controller.rb`:
  Upstream completely redesigned the admin dashboard.
  glitch-soc tracked extra features, but that list is
  gone.
  Followed upstram.
- `app/views/admin/dashboard/index.html.haml`
  Upstream completely redesigned the admin dashboard.
  glitch-soc tracked extra features, but that list is
  gone.
  Followed upstram.
2021-10-14 21:44:57 +02:00
..
account_actions Add inline description of moderation actions in moderation interface (#15792) 2021-02-24 16:53:16 +01:00
account_moderation_notes
account_warnings
accounts Add ability to skip sign-in token authentication for specific users (#16427) 2021-07-08 05:31:28 +02:00
action_logs Merge branch 'main' into glitch-soc/merge-upstream 2021-03-24 10:53:50 +01:00
announcements
change_emails
custom_emojis Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
dashboard Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +02:00
domain_allows Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
domain_blocks Merge branch 'master' into glitch-soc/merge-upstream 2020-12-19 00:55:12 +01:00
email_domain_blocks Fix some ignored brakeman warnings (#15829) 2021-03-07 07:06:56 +01:00
follow_recommendations Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
instances Change number_to_human calls to always use 3-digits precision (#16469) 2021-07-07 21:13:08 +02:00
invites
ip_blocks Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
pending_accounts Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
relationships
relays
report_notes
reports Merge branch 'main' into glitch-soc/merge-upstream 2021-07-11 21:41:23 +02:00
rules Fix missing source strings and inconsistent lead text style in admin UI (#16052) 2021-04-17 11:12:49 +02:00
settings Merge branch 'main' into glitch-soc/merge-upstream 2021-05-07 18:21:59 +02:00
statuses Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
tags Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
warning_presets