djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-28 19:10:22 -05:00
Code Issues Packages Projects Releases Wiki Activity
9c10aaa4d5
tootlab-mastodon/app/javascript/mastodon/features/compose
History
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
..
components Merge commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer 2024-02-22 20:58:41 +01:00
containers Change design of compose form in web UI (#28119) 2024-01-25 15:41:31 +00:00
util Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
index.jsx Change design of compose form in web UI (#28119) 2024-01-25 15:41:31 +00:00