Thibaut Girka 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.		2020-03-22 16:10:44 +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	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
accounts	Add option to include resolved DNS records when blacklisting e-mail domains in admin UI (#13254)	2020-03-12 22:35:20 +01:00
action_logs	Use local time in audit log (#10751)	2019-05-11 06:46:01 +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-01-20 18:31:11 +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	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	Various fixes and improvements (#12878)	2020-01-20 15:55:03 +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
relationships	Change followers page to relationships page in admin UI (#12927)	2020-01-23 20:33:20 +01: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-01-20 18:31:11 +01:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-08 19:38:53 +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-20 18:31:11 +01:00
warning_presets	Add titles to warning presets in admin UI (#13252)	2020-03-12 17:57:59 +01:00