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
..
aliases	Add account migration UI (#11846)	2019-09-19 20:58:19 +02:00
applications
deletes	Fix 2FA challenge and password challenge for non-database users (#11831)	2019-09-15 21:08:39 +02:00
exports	Add account migration UI (#11846)	2019-09-19 20:58:19 +02:00
featured_tags	Add explanation to featured hashtags page and profile (#11586)	2019-08-17 18:07:52 +02:00
flavours
identity_proofs
imports
migration/redirects	Add (back) option to set redirect notice on account without moving followers (#11994)	2019-09-29 05:03:19 +02:00
migrations	Add (back) option to set redirect notice on account without moving followers (#11994)	2019-09-29 05:03:19 +02:00
preferences	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-27 12:14:01 +01:00
profiles	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
shared
two_factor_authentication	Fix TOTP codes not being filtered from logs during enabling/disabling (#11877)	2019-09-18 02:48:40 +02:00
two_factor_authentications	Add password challenge to 2FA settings, e-mail notifications (#11878)	2019-09-18 16:37:27 +02:00