Claire e590177b29 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	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	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	Fix IP blocks in admin panel	2020-10-28 23:55:41 +01: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	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	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