Glitch-Shrike/app/javascript/mastodon
Claire 1665b84285 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Not really a conflict, just a glitch-soc-only dependency textually too close
  to an updated upstream one.
- `yarn.lock`:
  Not really a conflict, just a glitch-soc-only dependency textually too close
  to an updated upstream one.
2021-10-13 15:50:24 +02:00
..
actions Merge branch 'main' into glitch-soc/merge-upstream 2021-09-28 12:37:54 +02:00
components Add single option votes tooltip in polls (#16849) 2021-10-13 04:59:31 +02:00
containers Change routing paths to use usernames in web UI (#16171) 2021-09-26 05:46:13 +02:00
features Merge branch 'main' into glitch-soc/merge-upstream 2021-09-30 11:45:13 +02:00
locales Merge branch 'main' into glitch-soc/merge-upstream 2021-06-03 20:47:02 +02:00
middleware
reducers Change routing paths to use usernames in web UI (#16171) 2021-09-26 05:46:13 +02:00
selectors
service_worker Change routing paths to use usernames in web UI (#16171) 2021-09-26 05:46:13 +02:00
storage
store
utils Change max. image dimensions to 1920x1080px (1080p) (#15690) 2021-02-09 01:21:06 +01:00
api.js Change routing paths to use usernames in web UI (#16171) 2021-09-26 05:46:13 +02:00
base_polyfills.js
blurhash.js
common.js
compare_id.js
extra_polyfills.js
initial_state.js Merge branch 'main' into glitch-soc/merge-upstream 2021-06-30 00:42:52 +02:00
is_mobile.js
load_keyboard_extensions.js
load_polyfills.js
main.js
performance.js
ready.js
scroll.js
settings.js
stream.js
test_setup.js
uuid.js