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	Add missing rejection handling for Promises (#7008)	7 years ago
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	Cache media only when storage can be freed (#7547)	7 years ago
store	Restore vanilla components	7 years ago
utils	Resize images by area instead of fixed dimensions (#8083)	6 years ago
.gitkeep	Replace sprockets/browserify with Webpack (#2617)	8 years ago
api.js	Refactor /api/web APIs to use the centralized axios instance (#6223)	7 years ago
base_polyfills.js	Refactor resizeImage method (#7236)	7 years ago
common.js	Upgrade webpack to version v4.x (#6655)	6 years ago
compare_id.js	Fix comparing id (#7180)	7 years ago
extra_polyfills.js	Restore vanilla components	7 years ago
initial_state.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
is_mobile.js	Restore vanilla components	7 years ago
link_header.js	Restore vanilla components	7 years ago
load_polyfills.js	Refactor resizeImage method (#7236)	7 years ago
main.js	bug fix (WebPush does not work) (#6120)	7 years ago
performance.js	Restore vanilla components	7 years ago
ready.js	Restore vanilla components	7 years ago
rtl.js	Restore vanilla components	7 years ago
scroll.js	Restore vanilla components	7 years ago
settings.js	Implement tag auto-completion by history (#6621)	7 years ago
stream.js	Use randomized setTimeout when fallback-polling and re-add since_id (#7522)	7 years ago
test_setup.js	Restore vanilla components	7 years ago
uuid.js	Restore vanilla components	7 years ago