mastodon/app/views/admin
Thibaut Girka ec49aa8175 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, we deleted it to not be flooded by Depandabot.
  Kept deleted.
- `Gemfile.lock`:
  Puma updated on both sides, went for the most recent version.
- `app/controllers/api/v1/mutes_controller.rb`:
  Upstream updated the serializer to support timed mutes, while
  glitch-soc added a custom API ages ago to get information that
  is already available elsewhere.
  Dropped the glitch-soc-specific API, went with upstream changes.
- `app/javascript/core/admin.js`:
  Conflict due to changing how assets are loaded. Went with upstream.
- `app/javascript/packs/public.js`:
  Conflict due to changing how assets are loaded. Went with upstream.
- `app/models/mute.rb`:
  🤷
- `app/models/user.rb`:
  New user setting added upstream while we have glitch-soc-specific
  user settings. Added upstream's user setting.
- `config/settings.yml`:
  Upstream added a new user setting close to a user setting we had
  changed the defaults for. Added the new upstream setting.
- `package.json`:
  Upstream dependency updated “too close” to a glitch-soc-specific
  dependency. No real conflict. Updated the dependency.
2020-10-21 19:10:50 +02:00
..
account_actions Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00
account_moderation_notes
account_warnings Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
accounts Fix method of the DELETE DATA button (#14855) 2020-09-21 20:37:19 +02:00
action_logs Fix admin audit log crash due to glitch-soc theming changes 2020-04-04 23:15:08 +02: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 'master' into glitch-soc/merge-upstream 2020-06-26 13:02:14 +02:00
dashboard Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
domain_allows Fix upstream changes breaking because of glitch-soc's theming engine 2019-09-13 20:28:22 +02:00
domain_blocks Fix domain block edition in glitch-soc 2019-08-08 09:14:20 +02: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 Improve appearence consistency of settings pages (#13938) 2020-06-26 00:36:30 +02: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 IP-based rules (#14963) 2020-10-12 16:33:49 +02:00
pending_accounts Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02: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
reports Merge branch 'master' into glitch-soc/merge-upstream 2020-06-26 13:02:14 +02:00
settings Add support for setting Content Warning for CW-less outgoing toots 2020-05-30 18:27:00 +02:00
statuses Merge branch 'master' into glitch-soc/merge-upstream 2020-05-03 21:23:49 +02:00
tags Merge branch 'master' into glitch-soc/merge-upstream 2020-06-26 13:02:14 +02:00
warning_presets Add titles to warning presets in admin UI (#13252) 2020-03-12 17:57:59 +01:00