Glitch-Shrike/app/javascript/mastodon
Thibaut Girka c077cdaba7 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/relationships_controller.rb`:
  Upstream changed a line too close to a glitch-soc only line related to
  glitch-soc's theming system.
  Applied upstream changes accordingly.
2020-11-12 22:13:57 +01:00
..
actions Merge branch 'master' into glitch-soc/merge-upstream 2020-11-12 22:13:57 +01:00
components Bump detect-passive-events from 1.0.5 to 2.0.1 (#15003) 2020-11-05 02:21:05 +09:00
containers Add pop-out player for audio/video in web UI (#14870) 2020-09-28 13:29:43 +02:00
features Merge branch 'master' into glitch-soc/merge-upstream 2020-11-12 22:13:57 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2020-11-12 22:13:57 +01:00
middleware
reducers Add button to dismiss desktop notifications permissions banner (#15141) 2020-11-11 05:36:29 +01:00
selectors
service_worker
storage
store
utils Change how CDN_HOST is passed down to make assets build reproducible (#14381) 2020-10-13 01:19:35 +02:00
api.js
base_polyfills.js
common.js
compare_id.js
extra_polyfills.js
initial_state.js Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
is_mobile.js Bump detect-passive-events from 1.0.5 to 2.0.1 (#15003) 2020-11-05 02:21:05 +09:00
load_keyboard_extensions.js
load_polyfills.js
main.js Fix browser notification permission request logic (#13543) 2020-10-13 00:37:21 +02:00
performance.js
ready.js
rtl.js
scroll.js
settings.js
stream.js Better manage subscriptionCounters (#14608) 2020-08-24 14:06:45 +02:00
test_setup.js
uuid.js