Thibaut Girka dc2ab6e646 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/javascript/packs/public.js`:
  Upstream removed an unused function in code that has
  been refactored a bit. Removed that function in the corresponding
  places.

2020-01-20 18:31:11 +01:00

..

aliases

Add account migration UI (#11846)

2019-09-19 20:58:19 +02:00

applications

Various fixes and improvements (#12878)

2020-01-20 15:55:03 +01:00

deletes

Fix 2FA challenge and password challenge for non-database users (#11831)

2019-09-15 21:08:39 +02:00

exports

Use different strings on exports page (#12569)

2019-12-19 12:47:55 +01:00

featured_tags

…

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

2020-01-04 23:04:42 +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