mastodon/app/views/settings
Thibaut Girka cc94c90bf1 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
..
aliases Add account migration UI () 2019-09-19 20:58:19 +02:00
applications Redesign forms, verify link ownership with rel="me" () 2018-09-18 16:45:58 +02:00
deletes Fix 2FA challenge and password challenge for non-database users () 2019-09-15 21:08:39 +02:00
exports Add account migration UI () 2019-09-19 20:58:19 +02:00
featured_tags Add explanation to featured hashtags page and profile () 2019-08-17 18:07:52 +02:00
flavours Fix settings/flavours 2019-03-16 16:21:20 +01:00
identity_proofs squashed identity proof updates () 2019-03-28 18:01:09 +01:00
imports Add option to overwrite imported data () 2019-02-03 03:59:51 +01:00
migration/redirects Add (back) option to set redirect notice on account without moving followers () 2019-09-29 05:03:19 +02:00
migrations Add (back) option to set redirect notice on account without moving followers () 2019-09-29 05:03:19 +02:00
preferences Add option to disable emoji replacements 2019-08-12 23:01:37 +02:00
profiles Merge branch 'master' into glitch-soc/merge-upstream 2019-09-30 12:23:57 +02:00
shared 2FA controller cleanup () 2017-04-22 04:23:17 +02:00
two_factor_authentication Fix TOTP codes not being filtered from logs during enabling/disabling () 2019-09-18 02:48:40 +02:00
two_factor_authentications Add password challenge to 2FA settings, e-mail notifications () 2019-09-18 16:37:27 +02:00