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 e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.		6 years ago
..
activitypub	Prevent multiple handlers for Delete of Actor from running (#9292)	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	…
application_extension.rb	…
delivery_failure_tracker.rb	…
entity_cache.rb	Remove intermediary arrays when creating hash maps from results (#9291)	6 years ago
exceptions.rb	…
extractor.rb	…
fast_geometry_parser.rb	…
feed_manager.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
formatter.rb	Remove intermediary arrays when creating hash maps from results (#9291)	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	…
request.rb	Fix TLS handshake timeout not being enforced (#9381)	6 years ago
rss_builder.rb	…
sanitize_config.rb	…
sidekiq_error_handler.rb	…
status_filter.rb	…
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	…