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-25 13:00:44 +00:00
2023-12-22 07:58:20 +00:00
2023-12-22 07:58:20 +00:00
2024-01-22 11:52:26 +00:00
2023-12-22 07:58:20 +00:00
2023-12-29 10:39:10 +00:00
2023-12-22 07:58:20 +00:00
2024-01-11 10:08:49 +00:00
2023-09-13 15:10:41 +02:00
2024-01-25 13:00:44 +00:00
2023-12-22 07:58:20 +00:00
2023-12-22 07:58:20 +00:00
2023-12-22 07:58:20 +00:00
2024-01-02 09:11:53 +00:00
2023-12-22 07:58:20 +00:00
2024-01-12 09:17:10 +00:00
2024-01-05 11:29:19 +00:00
2023-12-22 07:58:20 +00:00
2024-01-25 15:41:31 +00:00
2023-12-29 10:39:10 +00:00
2023-12-29 10:39:10 +00:00
2023-12-22 07:58:20 +00:00
2023-12-22 07:58:20 +00:00
2023-12-29 10:39:10 +00:00
2023-12-22 07:58:20 +00:00
2023-12-29 10:39:10 +00:00
2024-01-09 09:30:33 +00:00
2023-12-22 07:58:20 +00:00
2024-01-17 14:23:14 +00:00
2024-01-09 10:56:13 +00:00
2023-12-22 07:58:20 +00:00
2023-12-22 07:58:20 +00:00
2023-12-22 07:58:20 +00:00
2023-12-22 07:58:20 +00:00
2024-01-17 14:23:14 +00:00
2023-10-31 16:05:44 +00:00
2023-12-29 10:39:10 +00:00
2024-01-15 11:06:25 +00:00
2024-01-02 09:11:53 +00:00
2023-12-22 07:58:20 +00:00
2023-12-22 07:58:20 +00:00
2024-01-17 14:23:14 +00:00
2023-12-22 07:58:20 +00:00
2024-01-02 09:11:53 +00:00
2023-12-22 07:58:20 +00:00
2023-06-02 15:00:27 +02:00
2023-10-31 16:05:44 +00:00
2023-12-22 07:58:20 +00:00
2023-12-29 10:39:10 +00:00
2023-12-22 07:58:20 +00:00
2024-01-08 12:46:25 +00:00
2023-12-22 07:58:20 +00:00
2023-12-22 07:58:20 +00:00
2023-12-29 10:39:10 +00:00
2023-09-13 15:10:41 +02:00
2024-01-22 11:52:26 +00:00
2023-12-22 07:58:20 +00:00
2023-12-22 07:58:20 +00:00
2023-12-11 08:22:52 +00:00
2024-01-22 11:52:26 +00:00
2023-07-13 14:22:20 +02:00
2024-01-17 14:23:14 +00:00
2023-12-22 07:58:20 +00:00
2023-12-22 07:58:20 +00:00
2023-12-22 07:58:20 +00:00
2023-12-22 07:58:20 +00:00
2023-12-22 07:58:20 +00:00
2023-12-22 07:58:20 +00:00
2023-12-13 09:52:37 +00:00
2023-12-22 07:58:20 +00:00
2024-01-04 09:24:13 +00:00
2024-01-04 09:24:13 +00:00
2024-01-25 13:00:44 +00:00
2023-12-22 07:58:20 +00:00
2024-01-11 10:08:49 +00:00
2024-01-23 10:11:37 +00:00
2023-12-22 07:58:20 +00:00
2023-12-22 07:58:20 +00:00
2023-12-29 10:39:10 +00:00
2023-12-05 16:07:53 +00:00
2023-12-22 07:58:20 +00:00
2023-12-22 07:58:20 +00:00
2023-12-22 07:58:20 +00:00
2023-12-22 07:58:20 +00:00
2023-12-29 10:39:10 +00:00
2023-12-22 07:58:20 +00:00
2024-01-05 11:29:19 +00:00
2023-12-29 10:39:10 +00:00
2023-12-29 10:39:10 +00:00
2023-12-22 07:58:20 +00:00
2023-09-13 15:10:41 +02:00
2024-01-03 09:19:46 +00:00
2023-09-13 15:10:41 +02:00
2023-12-22 07:58:20 +00:00
2024-01-22 11:52:26 +00:00
2023-12-05 16:07:53 +00:00
2023-12-22 07:58:20 +00:00
2023-12-22 07:58:20 +00:00
2023-12-18 08:25:21 +00:00
2023-12-29 10:39:10 +00:00
2023-12-22 07:58:20 +00:00
2023-12-22 07:58:20 +00:00
2024-01-19 09:41:57 +00:00
2023-12-22 07:58:20 +00:00
2024-01-05 11:29:19 +00:00
2023-12-22 07:58:20 +00:00
2024-01-25 13:00:44 +00:00
10a0d76bf0