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 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”.		6 years ago
..
actions	Do not cause an error if domain_lists.blocks.next is undefined (#8021)	6 years ago
components	Do not scroll up when modal is opened (#8095)	6 years ago
containers	Compensate for scrollbar disappearing when media modal visible (#8100)	6 years ago
features	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
middleware	…
reducers	Refactor privacyPrefence() to use priority list (#7945)	6 years ago
selectors	Make whole-word filter regex consistent between Ruby and JS (#7987)	6 years ago
service_worker	Disable service worker media cache and IndexedDB storage (#7932)	6 years ago
storage	…
store	…
utils	Resize images by area instead of fixed dimensions (#8083)	6 years ago
.gitkeep	…
api.js	…
base_polyfills.js	…
common.js	Upgrade webpack to version v4.x (#6655)	6 years ago
compare_id.js	…
extra_polyfills.js	…
initial_state.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
is_mobile.js	…
link_header.js	…
load_polyfills.js	…
main.js	…
performance.js	…
ready.js	…
rtl.js	…
scroll.js	…
settings.js	…
stream.js	…
test_setup.js	…
uuid.js	…