Thibaut Girka 41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/helpers/statuses_helper.rb Upstream moved account helpers to their own file, we had extra helpers there, moved too. - app/lib/sanitize_config.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - config/locales/simple_form.en.yml - spec/lib/sanitize_config_spec.rb		2019-10-27 12:14:01 +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
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	2019-10-10 17:26:08 +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 block reports from domain (#8830)	2018-10-20 08:02:44 +02:00
followers	Fix admin UI view of local followers (#9712)	2019-01-04 11:28:14 +01:00
instances	Fix admin interface showing superfluous reject media/reports on suspended blocks (#11749)	2019-09-03 22:53:27 +02: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
report_notes
reports	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-27 12:14:01 +01:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-10 17:26:08 +02: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	2019-10-27 12:14:01 +01:00
warning_presets	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00