mastodon-docker-playground/app/javascript/mastodon
Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.
2022-11-06 09:50:41 +01:00
..
actions Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
components Change design of new list form in web UI (#19801) 2022-11-05 23:06:32 +01:00
containers Change sign-in banner to reflect disabled or moved account status (#19773) 2022-11-05 18:28:13 +01:00
features Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
locales Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
middleware
reducers Fix handling of duplicate and out-of-order notifications in WebUI (#19693) 2022-11-04 00:14:39 +01:00
selectors Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
service_worker Disable media cache on service worker (#19471) 2022-10-26 18:21:36 +02:00
store
utils Fix WebUI error in development mode (#19078) 2022-08-29 10:02:40 +02:00
api.js Replace `CancelToken` to `AbortSignal` (#19352) 2022-10-14 03:16:37 +02:00
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 Replace `CancelToken` to `AbortSignal` (#19352) 2022-10-14 03:16:37 +02:00
initial_state.js Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
is_mobile.js Hide list panel from nav bar in mobile layout (#19337) 2022-10-10 21:41:25 +02:00
load_keyboard_extensions.js
load_polyfills.js Replace `CancelToken` to `AbortSignal` (#19352) 2022-10-14 03:16:37 +02:00
main.js Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +02:00
performance.js
permissions.js Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
ready.js Disable push notification when not logged in (#19272) 2022-10-03 18:15:47 +02:00
scroll.js
settings.js Add dismissable hints to various timelines in web UI (#19315) 2022-10-09 06:08:37 +02:00
stream.js Fixed ESLint error (#15214) 2020-11-23 17:35:14 +01:00
test_setup.js
uuid.js