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.

David Yip e0eebba461 Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml		7 years ago
..
actions	Use randomized setTimeout when fallback-polling and re-add since_id (#7522)	7 years ago
components	Open video modal on public UI (#7469)	7 years ago
containers	Open video modal on public UI (#7469)	7 years ago
features	Reword the direct message warning (#7420)	7 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
middleware	…
reducers	Fix gap insertion for timeline disconnection (#7363)	7 years ago
selectors	…
service_worker	Let navigator follow redirect instead that handling redirect in fetch (#7500)	7 years ago
storage	Test if navigator.storage.estimate exists before using it (#7504)	7 years ago
store	…
utils	Fix images resized in browser getting cropped (#7514)	7 years ago
.gitkeep	…
api.js	…
base_polyfills.js	Refactor resizeImage method (#7236)	7 years ago
compare_id.js	Fix comparing id (#7180)	7 years ago
extra_polyfills.js	…
initial_state.js	…
is_mobile.js	…
link_header.js	…
load_polyfills.js	Refactor resizeImage method (#7236)	7 years ago
main.js	…
performance.js	…
ready.js	…
rtl.js	…
scroll.js	…
settings.js	…
stream.js	Use randomized setTimeout when fallback-polling and re-add since_id (#7522)	7 years ago
test_setup.js	…
uuid.js	…