djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-29 11:30:28 -05:00
Code Issues Packages Projects Releases Wiki Activity
f3ce9653eb
tootlab-mastodon/app/javascript/mastodon/features/compose
History
Claire 32c70d2f09 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
2022-11-14 08:35:55 +01:00
..
components Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 08:35:55 +01:00
containers Add the ability to edit media attachment metadata for any unattached media (#20402) 2022-11-11 21:22:17 +01:00
util Update twitter-text from 1.14 to 3.1.0 and fix toot character counting (#15382) 2021-03-02 12:02:56 +01:00
index.js Fix redirecting to /publish when compose form is visible in web UI (#19427) 2022-10-23 23:37:58 +02:00