You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		5 years ago
..
aliases	Add account migration UI (#11846)	5 years ago
applications	…
deletes	Fix 2FA challenge and password challenge for non-database users (#11831)	5 years ago
exports	Add account migration UI (#11846)	5 years ago
featured_tags	…
flavours	…
identity_proofs	…
imports	…
migration/redirects	Add (back) option to set redirect notice on account without moving followers (#11994)	5 years ago
migrations	Add (back) option to set redirect notice on account without moving followers (#11994)	5 years ago
preferences	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
profiles	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
shared	…
two_factor_authentication	Fix TOTP codes not being filtered from logs during enabling/disabling (#11877)	5 years ago
two_factor_authentications	Add password challenge to 2FA settings, e-mail notifications (#11878)	5 years ago