2
0
Fork 0
chuckya-fe-standalone/app/javascript/mastodon
Thibaut Girka e9ad99bc93 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Not really a conflict, just some glitch-soc-specific dependency
  too close to an upstream-updated one.
2020-07-07 15:58:45 +02:00
..
actions Add ability to choose media thumbnail in web UI (#14244) 2020-07-07 12:14:19 +02:00
components Replace shortNumberFormat with <ShortNumber> (#14061) 2020-07-06 14:27:32 +02:00
containers Fix expanded video player issues (#13541) 2020-04-25 12:16:05 +02:00
features Merge branch 'master' into glitch-soc/merge-upstream 2020-07-07 15:58:45 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2020-07-07 15:58:45 +02:00
middleware Fix 404 and 410 API errors being silently discarded in WebUI (#13279) 2020-03-28 17:59:45 +01:00
reducers Add ability to choose media thumbnail in web UI (#14244) 2020-07-07 12:14:19 +02:00
selectors
service_worker
storage
store
utils Replace shortNumberFormat with <ShortNumber> (#14061) 2020-07-06 14:27:32 +02:00
api.js
base_polyfills.js
common.js
compare_id.js
extra_polyfills.js
initial_state.js
is_mobile.js
load_keyboard_extensions.js
load_polyfills.js
main.js
performance.js
ready.js
rtl.js
scroll.js
settings.js
stream.js
test_setup.js Replace to testing-library from enzyme (#14152) 2020-06-29 13:58:07 +02:00
uuid.js