Thibaut Girka ab5ff638f2 Merge branch 'master' into glitch-soc/master ... Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc		2019-12-19 13:52:54 +01:00
..
aliases	Add account migration UI (#11846)	2019-09-19 20:58:19 +02:00
applications	Use codeblock for native redirect URI (#12570)	2019-12-09 04:30:58 +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	Add explanation to featured hashtags page and profile (#11586)	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 (#10375)	2019-03-28 18:01:09 +01:00
imports	Add option to overwrite imported data (#9962)	2019-02-03 03:59:51 +01:00
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-12-07 12:28:59 +01:00
profiles	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
shared	2FA controller cleanup (#2296)	2017-04-22 04:23:17 +02:00
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