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

Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
  Upstream added the `bug` label to bug reports.
  Did the same.
- `app/services/fan_out_on_write_service.rb`:
  Upstream put DMs back into timelines, glitch-soc was already doing it.
  Ignored upstream changes.

2020-11-20 13:27:48 +01:00

..

aliases

Fix account aliases page (#13452)

2020-04-13 06:41:43 +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

Add import/export feature for bookmarks (#14956)

2020-11-19 17:48:13 +01:00

featured_tags

Changed tag most_used to recently_used (#14760)

2020-09-07 17:47:41 +02:00

flavours

Fix settings/flavours

2019-03-16 16:21:20 +01:00

identity_proofs

Add ability to remove identity proofs from account (#13682)

2020-05-10 11:21:10 +02: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

2020-10-21 19:10:50 +02:00

profiles

Merge branch 'master' into glitch-soc/merge-upstream

2020-05-03 21:23:49 +02:00

shared

2FA controller cleanup (#2296)

2017-04-22 04:23:17 +02:00

two_factor_authentication

Add subresource integrity for JS and CSS assets (#15096)

2020-11-06 11:56:31 +01:00

two_factor_authentication_methods

Add WebAuthn as an alternative 2FA method (#14466)

2020-08-24 16:46:27 +02:00