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 46259a36d0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.		6 years ago
..
applications	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
deletes	Fix autocomplete option in haml files (#4438)	7 years ago
exports	Group reports by target account (#8674)	6 years ago
flavours	Don't show skins selector when there's only one (#256)	7 years ago
follower_domains	Scrollable tables in settings pages (#4857)	7 years ago
imports	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
migrations	Redesign public profiles and toots (#8068)	6 years ago
notifications	Add preference for report notification e-mails, skip for duplicates (#8559)	6 years ago
preferences	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
profiles	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
shared	2FA controller cleanup (#2296)	8 years ago
two_factor_authentication	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
two_factor_authentications	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago