Claire 90528f43bc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/configuration.js`: Upstream updated the `js-yaml` dependency, which changed how to call it. Those changes conflicted because that code is pretty different in glitch-soc which has to deal with its more complex theming system. Proceeded to the same compatibility changes in glitch-soc's code. - `package.json` and `yarn.lock`: Not really a conflict, just glitch-soc-specific dependencies textually too close to some dependencies updated upstream.		2021-01-06 18:08: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
account_warnings
accounts	Fix admins being able to suspend their instance actor (#14567)	2020-12-15 17:23:58 +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
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	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-19 00:55:12 +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
report_notes
reports	Merge branch 'master' into glitch-soc/merge-upstream	2021-01-06 18:08:06 +01:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-19 00:55:12 +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