You cannot 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 c1c514ca70 Merge branch 'master' into glitch-soc/merge-upstream ... Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.		8 years ago
..
activitypub	Fix incorrect context definition for the "featured" keyword (#8090)	8 years ago
ostatus	Fix N+1 on AtomSerializer (#7669)	8 years ago
settings	…
activity_tracker.rb	…
application_extension.rb	…
delivery_failure_tracker.rb	…
entity_cache.rb	Fix missing updated_at attribute on emoji EntityCache (#7297)	8 years ago
exceptions.rb	Detect and prevent image bombs, max. processable dimension 4096^2 (#7229)	8 years ago
extractor.rb	…
fast_geometry_parser.rb	Fix avatar and header issues by using custom geometry detector (#6515)	8 years ago
feed_manager.rb	Make whole-word filter regex consistent between Ruby and JS (#7987)	8 years ago
formatter.rb	Enable custom emojis in profiles (notes, field values, display names) (#7374)	8 years ago
hash_object.rb	…
inline_renderer.rb	…
language_detector.rb	Disable language detection for texts shorter than 140 characters (#8010)	8 years ago
potential_friendship_tracker.rb	Fix activity:interactions counter to count all interactions (#8037)	8 years ago
request.rb	Merge `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` into `ALLOW_ACCESS_TO_HIDDEN_SERVICE` (#7901)	8 years ago
rss_builder.rb	Add RSS feeds for end-users (#7259)	8 years ago
sanitize_config.rb	Whitelist dat/ipfs/gopher links in sanitizer (#8034)	8 years ago
sidekiq_error_handler.rb	Raise Mastodon::HostValidationError when host for HTTP request is private (#6410)	8 years ago
status_filter.rb	Fix n+1 queries in StatusThreadingConcern (#7321)	8 years ago
status_finder.rb	…
tag_manager.rb	…
themes.rb	…
user_settings_decorator.rb	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
webfinger_resource.rb	…