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

Conflicts:
- config/locales/en.yml
  Conflict caused by the glitch-soc-specific “flavour” string being too close
  to the newly introduced “identity_proofs” string. Just included both.

2019-03-20 13:54:00 +01:00

..

applications

Redesign forms, verify link ownership with rel="me" (#8703)

2018-09-18 16:45:58 +02:00

deletes

Fix autocomplete option in haml files (#4438)

2017-07-29 14:20:31 +02:00

exports

Add CSV export for lists and domain blocks (#9677)

2019-01-01 13:44:04 +01:00

featured_tags

Add featured hashtags to profiles (#9755)

2019-02-04 04:25:59 +01:00

flavours

Fix settings/flavours

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

identity_proofs

Add Keybase integration (#10297)

2019-03-18 21:00:55 +01:00

imports

Add option to overwrite imported data (#9962)

2019-02-03 03:59:51 +01:00

migrations

Redesign public profiles and toots (#8068)

2018-07-28 19:25:33 +02:00

notifications

Add preference for report notification e-mails, skip for duplicates (#8559)

2018-09-02 00:11:58 +02:00

preferences

Make displaying application used to toot opt-in (#9897)

2019-02-02 19:18:15 +01:00

profiles

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

2018-12-15 10:45:53 +01:00

shared

…

two_factor_authentication

Redesign forms, verify link ownership with rel="me" (#8703)

2018-09-18 16:45:58 +02:00

two_factor_authentications

Redesign forms, verify link ownership with rel="me" (#8703)

2018-09-18 16:45:58 +02:00