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
..
activitypub	Add option to block reports from domain (#8830)	6 years ago
ostatus	Improve support for aspects/circles (#8950)	6 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
activity_tracker.rb	Fix stats expiring too quickly because of variable mistake (#6155)	7 years ago
application_extension.rb	…
delivery_failure_tracker.rb	After 7 days of repeated delivery failures, give up on inbox (#5131)	7 years ago
entity_cache.rb	Fix missing updated_at attribute on emoji EntityCache (#7297)	7 years ago
exceptions.rb	Detect and prevent image bombs, max. processable dimension 4096^2 (#7229)	7 years ago
extractor.rb	Using double splat operator (#5859)	7 years ago
fast_geometry_parser.rb	Fix avatar and header issues by using custom geometry detector (#6515)	7 years ago
feed_manager.rb	Improve support for aspects/circles (#8950)	6 years ago
formatter.rb	Improve support for aspects/circles (#8950)	6 years ago
hash_object.rb	…
inline_renderer.rb	Add conversations API (#8832)	6 years ago
language_detector.rb	Leave unknown language as nil if account is remote (#8861)	6 years ago
potential_friendship_tracker.rb	Fix activity:interactions counter to count all interactions (#8037)	6 years ago
request.rb	Do not sign useless User-Agent or Accept-Encoding headers (#8533)	6 years ago
rss_builder.rb	Add RSS feeds for end-users (#7259)	7 years ago
sanitize_config.rb	Whitelist dat/ipfs/gopher links in sanitizer (#8034)	6 years ago
sidekiq_error_handler.rb	Raise Mastodon::HostValidationError when host for HTTP request is private (#6410)	7 years ago
status_filter.rb	Fix n+1 queries in StatusThreadingConcern (#7321)	7 years ago
status_finder.rb	…
tag_manager.rb	…
themes.rb	Allow selecting both default flavour and theme	6 years ago
user_settings_decorator.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
webfinger_resource.rb	…