fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-27 23:55:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/views/admin
History
Claire 8743b1ea40 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/trends/links/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/links/preview_card_providers/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/statuses/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
- `app/views/admin/trends/tags/index.html.haml`:
  Not really a conflict, upstream change textually too close to a glitch-soc
  change (removed `javascript_pack_tag` to accomodate for glitch-soc's theming
  system).
  Ported upstream changes.
2022-03-02 20:48:27 +01:00
..
account_actions Add inline description of moderation actions in moderation interface (#15792) 2021-02-24 16:53:16 +01:00
account_warnings Fix link colors in report and strike details (#17616) 2022-02-22 15:27:25 +01:00
accounts Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
action_logs Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 10:45:25 +01:00
announcements Fix design of announcements in admin UI (#12989) 2020-01-28 02:21:00 +01:00
change_emails Hide misleading “You will be sent a confirmation e-mail” hint from admin view (#9973) 2019-02-05 15:11:35 +01:00
custom_emojis Merge branch 'main' into glitch-soc/merge-upstream 2022-02-26 09:29:23 +01:00
dashboard Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
disputes/appeals Fix issue with glitch-soc's theming system 2022-02-17 10:59:01 +01: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 Adapt view for glitch-soc's theming system 2022-02-26 09:46:13 +01:00
follow_recommendations Merge branch 'main' into glitch-soc/merge-upstream 2022-02-26 09:29:23 +01:00
instances Enable domain purge button on suspended domains too (#17209) 2022-02-11 22:23:19 +01:00
invites Fix maxed-out invites not showing up as expired in UI (#10274) 2019-03-15 05:35:17 +01:00
ip_blocks Merge branch 'main' into glitch-soc/merge-upstream 2021-12-16 16:20:44 +01:00
relationships Fix error on account relationships page in admin UI (#17444) 2022-02-05 05:06:34 +01:00
relays
report_notes Add appeals (#17364) 2022-02-14 21:27:53 +01:00
reports Merge branch 'main' into glitch-soc/merge-upstream 2022-03-02 18:02:48 +01:00
rules Fix missing source strings and inconsistent lead text style in admin UI (#16052) 2021-04-17 11:12:49 +02:00
settings Add option (on by default) to allow toots with content warnings to trend 2022-02-26 10:46:26 +01:00
statuses Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 10:45:25 +01:00
tags Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
trends Merge branch 'main' into glitch-soc/merge-upstream 2022-03-02 20:48:27 +01:00
warning_presets Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00