ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/views/admin
History
Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/form/admin_settings.rb`:
  New setting added upstream. Ported it.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream removed RTL classes. Did the same.
- `config/settings.yml`:
  New setting added upstream. Ported it.
 		2020-12-15 14:27:06 +01:00
..
account_actions Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
account_moderation_notes Improve admin UI for accounts (#7360) 2018-05-05 23:06:29 +02:00
account_warnings Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
accounts Add "invite request content" display in user account admin page (#15265) 2020-12-15 06:28:14 +01:00
action_logs Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +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 Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
dashboard Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
domain_allows Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
domain_blocks Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
email_domain_blocks Add option to include resolved DNS records when blacklisting e-mail domains in admin UI (#13254) 2020-03-12 22:35:20 +01:00
instances Fix performance on instances list in admin UI (#15282) 2020-12-14 09:06:34 +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 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 Fix admin-facing uses of inline CSS (#13575) 2020-04-28 19:39:16 +02:00
relays Display pending message on admin relays UI (#8494) 2018-08-28 05:39:43 +02:00
report_notes Improve report layout (#7188) 2018-04-20 02:28:48 +02:00
reports Merge branch 'master' into glitch-soc/merge-upstream 2020-12-15 14:27:06 +01:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2020-12-15 14:27:06 +01:00
statuses Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
tags Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
warning_presets Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00