mastodon/app/javascript/mastodon
Claire 8ec4be4233 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, upstream-updated dependency (redis) textually too
  close to glitch-soc-only dependecy.
  Updated redis gem like upstream did.
2021-08-09 23:25:49 +02:00
..
actions Merge branch 'main' into glitch-soc/merge-upstream 2021-07-25 12:48:48 +02:00
components Fix crashes with Microsoft Translate on Microsoft Edge (#16525) 2021-07-23 02:53:17 +02:00
containers Improve modal flow and back button handling (#16499) 2021-07-13 15:45:17 +02:00
features Merge branch 'main' into glitch-soc/merge-upstream 2021-08-09 23:25:49 +02:00
locales Merge branch 'main' into glitch-soc/merge-upstream 2021-06-03 20:47:02 +02:00
middleware
reducers Add confirmation modal when closing media edit modal with unsaved changes (#16518) 2021-07-25 01:14:43 +02: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 Change max. image dimensions to 1920x1080px (1080p) (#15690) 2021-02-09 01:21:06 +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 Merge branch 'main' into glitch-soc/merge-upstream 2021-06-30 00:42:52 +02:00
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 Fix browser notification permission request logic (#13543) 2020-10-13 00:37:21 +02:00
performance.js
ready.js
scroll.js
settings.js
stream.js Fixed ESLint error (#15214) 2020-11-23 17:35:14 +01:00
test_setup.js Replace to testing-library from enzyme (#14152) 2020-06-29 13:58:07 +02:00
uuid.js