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
api.js
base_polyfills.js
blurhash.js
common.js
compare_id.js
extra_polyfills.js
initial_state.js	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-06 09:50:41 +01:00
is_mobile.js
load_keyboard_extensions.js
load_polyfills.js
main.js	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
performance.js
permissions.js
ready.js
scroll.js
settings.js
stream.js
test_setup.js
uuid.js