Claire 10a0d76bf0 Merge commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer ... Conflicts: - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream completely redesigned this, and glitch-soc had different handling for the character limit. Ported upstream's change to the new version. - `app/javascript/mastodon/features/compose/components/poll_form.jsx`: Upstream completely redesigned this, and glitch-soc had different limits for option length and number of options. Ported glitch-soc's changes to the new version. Additional change: - `app/javascript/styles/components.scss`: Change how the new image is looked up.		2024-02-22 20:58:41 +01:00
..
admin.jsx	Update `rails/ujs` delegate method usage (#27538)	2023-10-24 20:38:19 +00:00
application.js	Change `eslint` config to autofix missing comma and indentation in JS files (#26711)	2023-10-09 13:38:29 +02:00
common.js	[Glitch] Change how CDN_HOST is passed down to make assets build reproducible	2020-10-21 21:28:47 +02:00
error.js	Change how CDN_HOST is passed down to make assets build reproducible (#14381)	2020-10-13 01:19:35 +02:00
public-path.js	Move ESLint configs to overrides (#24370)	2023-04-03 12:41:10 +02:00
public.jsx	Fix @rails/ujs import on public.jsx (#2482)	2023-11-24 17:40:31 +01:00
share.jsx	Change design of compose form in web UI (#28119)	2024-01-25 15:41:31 +00:00
sign_up.js	Add client-side timeout on resend confirmation button (#26300)	2023-08-03 01:51:10 +02:00