vt-social/app/javascript/mastodon
Claire 7782e4dc0d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/about_controller.rb`:
  Minor conflict caused by glitch-soc's theming system.
  Ported upstream changes.
2020-12-10 09:41:49 +01:00
..
actions Merge branch 'master' into glitch-soc/merge-upstream 2020-12-09 14:42:33 +01:00
components Fix open media hotkey (#15308) 2020-12-09 00:24:13 +01:00
containers Fix unnecessary re-rendering of various components when typing in web UI (#15286) 2020-12-07 19:36:36 +01:00
features Merge branch 'master' into glitch-soc/merge-upstream 2020-12-10 09:41:49 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2020-12-05 17:33:37 +01:00
middleware
reducers Fix pop-out player appearing on mobile screens in web UI (#15157) 2020-11-16 05:16:39 +01:00
selectors Fix unnecessary re-rendering of various components when typing in web UI (#15286) 2020-12-07 19:36:36 +01:00
service_worker
storage
store
utils Fixed ESLint error (#15214) 2020-11-23 17:35:14 +01:00
api.js
base_polyfills.js
blurhash.js Fix not being able to open audio modal in web UI (#15283) 2020-12-07 04:29:37 +01:00
common.js
compare_id.js
extra_polyfills.js
initial_state.js
is_mobile.js Fix pop-out player appearing on mobile screens in web UI (#15157) 2020-11-16 05:16:39 +01:00
load_keyboard_extensions.js
load_polyfills.js
main.js
performance.js
ready.js
rtl.js
scroll.js
settings.js
stream.js Fixed ESLint error (#15214) 2020-11-23 17:35:14 +01:00
test_setup.js
uuid.js