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 dcded13a99 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
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
v2	Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661)	7 years ago
web	Add REST API for Web Push Notifications subscriptions (#7445)	7 years ago
base_controller.rb	Support min_id-based pagination in REST API (#8736)	6 years ago
oembed_controller.rb	Update status embeds (#4742)	7 years ago
push_controller.rb	Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205)	7 years ago
salmon_controller.rb	Fix response of signature_verification_failure_reason (#6441)	7 years ago
subscriptions_controller.rb	HTTP signatures (#4146)	7 years ago