You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 4a70792b4a Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, just a glitch-soc-only dependency too close to a dependency that got updated upstream. Updated as well. - `app/models/status.rb`: Not a real conflict, just a change too close to glitch-soc-changed code for optionally showing boosts in public timelines. Applied upstream changes. - `app/views/layouts/application.html.haml`: Upstream a new, static CSS file, conflict due to glitch-soc's theming system, include the file regardless of the theme. - `config/initializers/content_security_policy.rb`: Upstream dropped 'unsafe-inline' from the 'style-src' directive, but both files are very different. Removed 'unsafe-inline' as well.		5 years ago
..
aliases	Fix account aliases page (#13452)	5 years ago
applications	Various fixes and improvements (#12878)	5 years ago
deletes	Fix 2FA challenge and password challenge for non-database users (#11831)	5 years ago
exports	Use different strings on exports page (#12569)	5 years ago
featured_tags	Add explanation to featured hashtags page and profile (#11586)	5 years ago
flavours	Fix settings/flavours	6 years ago
identity_proofs	Add ability to remove identity proofs from account (#13682)	5 years ago
imports	Add option to overwrite imported data (#9962)	6 years ago
migration/redirects	Add (back) option to set redirect notice on account without moving followers (#11994)	5 years ago
migrations	Add (back) option to set redirect notice on account without moving followers (#11994)	5 years ago
preferences	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
profiles	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
shared	2FA controller cleanup (#2296)	8 years ago
two_factor_authentication	Fix TOTP codes not being filtered from logs during enabling/disabling (#11877)	5 years ago
two_factor_authentications	Add password challenge to 2FA settings, e-mail notifications (#11878)	5 years ago