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
..
account_moderation_notes	Improve admin UI for accounts (#7360)	7 years ago
accounts	Add "disable" button to report screen (#9024)	6 years ago
action_logs	Improve report layout (#7188)	7 years ago
change_emails	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
custom_emojis	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
dashboard	Fix tag usage display on admin dashboard	6 years ago
domain_blocks	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
email_domain_blocks	Add option to block reports from domain (#8830)	6 years ago
instances	Add option to block reports from domain (#8830)	6 years ago
invites	Add admin function to deactivate all invites (#8279)	6 years ago
relays	Display pending message on admin relays UI (#8494)	6 years ago
report_notes	Improve report layout (#7188)	7 years ago
reports	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
statuses	Allow to show a specific status in the admin interface	6 years ago
subscriptions	Scrollable tables in settings pages (#4857)	7 years ago
suspensions	Better singulars of account followers/toots. (#8471)	6 years ago