Thibaut Girka 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js		2018-09-19 21:46:01 +02:00
..
activitypub	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
ostatus	Improve federated ID validation (#8372)	2018-08-22 20:55:14 +02:00
settings	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-24 15:10:34 +02:00
activity_tracker.rb
application_extension.rb
delivery_failure_tracker.rb
entity_cache.rb
exceptions.rb
extractor.rb
fast_geometry_parser.rb
feed_manager.rb	Fix low-hanging rubocop gripes (#8458)	2018-08-26 19:22:46 +02:00
formatter.rb	Fix autoplay issue with spoiler tag (#8540)	2018-08-31 15:16:59 +02:00
hash_object.rb
inline_renderer.rb
language_detector.rb	Disable language detection for texts shorter than 140 characters (#8010)	2018-07-14 04:05:36 +02:00
potential_friendship_tracker.rb	Fix activity:interactions counter to count all interactions (#8037)	2018-07-16 18:35:43 +02:00
request.rb	Do not sign useless User-Agent or Accept-Encoding headers (#8533)	2018-08-31 04:22:52 +02:00
rss_builder.rb
sanitize_config.rb	Whitelist dat/ipfs/gopher links in sanitizer (#8034)	2018-07-16 22:17:43 +09:00
sidekiq_error_handler.rb
status_filter.rb
status_finder.rb
tag_manager.rb
themes.rb
user_settings_decorator.rb
webfinger_resource.rb