1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-10 04:39:11 +09:00
YuruToot/app/views/admin
Thibaut Girka 45709d6987 Merge branch 'master' into glitch-soc/master
Conflicts:
- `README.md`:
  We have different README files. Discarded upstream changes.
- `app/views/layouts/admin.html.haml`:
  Conflict due to glitch-soc theming system.
  Adapted upstream changes.
- `app/views/layouts/embedded.html.haml`:
  Conflict due to glitch-soc theming system.
  Adapted upstream changes.
- `yarn.lock`:
  No real conflict, glitch-specific dependency too close to
  an updated one. Adapted upstream change.
2020-01-20 15:00:22 +01:00
..
account_actions Add option to include reported statuses in warning e-mail (#11639) 2019-08-23 22:37:23 +02: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 link to search for users connected from the same IP address (#12157) 2019-10-24 22:49:26 +02:00
action_logs Use local time in audit log (#10751) 2019-05-11 06:46:01 +02: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-01-12 15:57:34 +01: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 Use heading actions and placeholders in settings (#12801) 2020-01-11 02:14:45 +01:00
followers Fix admin UI view of local followers (#9712) 2019-01-04 11:28:14 +01:00
instances Link to reports targetting instance in admin view (#12513) 2019-12-01 19:03:43 +01:00
invites Fix maxed-out invites not showing up as expired in UI (#10274) 2019-03-15 05:35:17 +01:00
pending_accounts Merge branch 'master' into glitch-soc/merge-upstream 2019-06-07 17:00:36 +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/master 2020-01-20 15:00:22 +01:00
settings Fix issue because of theming system 2019-12-19 14:42:16 +01:00
statuses Add quick links to the admin interface in the WebUI (#8545) 2019-01-04 13:10:43 +01:00
tags Merge branch 'master' into glitch-soc/merge-upstream 2020-01-04 23:04:42 +01:00
warning_presets Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00