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
..
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-15 20:53:08 +01:00
2024-01-15 20:53:08 +01:00
2024-01-25 15:41:31 +00:00
2024-01-25 15:41:31 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-15 20:53:08 +01:00
2024-01-15 20:53:08 +01:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-15 20:53:08 +01:00
2024-01-15 20:53:08 +01:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-15 20:53:08 +01:00
2024-01-15 20:53:08 +01:00
2024-02-06 20:22:42 +01:00
2024-02-06 20:22:42 +01:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-15 20:53:08 +01:00
2024-01-15 20:53:08 +01:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-15 20:53:08 +01:00
2024-01-15 20:53:08 +01:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-15 20:53:08 +01:00
2024-01-15 20:53:08 +01:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-15 20:53:08 +01:00
2024-01-15 20:53:08 +01:00
2024-01-15 20:53:08 +01:00
2024-01-15 20:53:08 +01:00
2024-01-15 20:53:08 +01:00
2024-01-15 20:53:08 +01:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-25 15:41:31 +00:00
2024-01-25 15:41:31 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-15 20:53:08 +01:00
2024-01-15 20:53:08 +01:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-15 20:53:08 +01:00
2024-01-15 20:53:08 +01:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-25 15:41:31 +00:00
2024-01-25 15:41:31 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-25 15:41:31 +00:00
2024-01-25 15:41:31 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-25 15:41:31 +00:00
2024-01-25 15:41:31 +00:00
2024-01-15 20:53:08 +01:00
2024-01-15 20:53:08 +01:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-02-06 20:22:42 +01:00
2024-02-06 20:22:42 +01:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-12 20:16:48 +00:00
2024-01-25 15:41:31 +00:00
2024-01-25 15:41:31 +00:00