mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
mastodon-glitch/app/javascript/mastodon/features/compose/components
History
Claire ef3d15554b Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept glitch-soc's README.
- `app/models/account.rb`:
  Not a real conflict, upstream updated some lines textually adjacent
  to glitch-soc-specific lines.
  Ported upstream's changes.
 		2024-02-24 14:46:14 +01:00
..
action_bar.jsx Change design of compose form in web UI (#28119) 2024-01-25 15:41:31 +00:00
autosuggest_account.jsx Change design of compose form in web UI (#28119) 2024-01-25 15:41:31 +00:00
character_counter.jsx Change design of compose form in web UI (#28119) 2024-01-25 15:41:31 +00:00
compose_form.jsx Merge commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer 2024-02-22 20:58:41 +01:00
edit_indicator.jsx Change design of compose form in web UI (#28119) 2024-01-25 15:41:31 +00:00
emoji_picker_dropdown.jsx Fixed the toggle emoji dropdown bug (#29012) 2024-01-30 13:38:49 +00:00
language_dropdown.jsx Change design of compose form in web UI (#28119) 2024-01-25 15:41:31 +00:00
navigation_bar.jsx Change design of compose form in web UI (#28119) 2024-01-25 15:41:31 +00:00
poll_button.jsx Change design of compose form in web UI (#28119) 2024-01-25 15:41:31 +00:00
poll_form.jsx Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream 2024-02-24 14:18:16 +01:00
privacy_dropdown.jsx Change design of compose form in web UI (#28119) 2024-01-25 15:41:31 +00:00
reply_indicator.jsx Change design of compose form in web UI (#28119) 2024-01-25 15:41:31 +00:00
search.jsx Fix duplicate and missing keys in search popout component in web UI (#28834) 2024-01-21 07:44:46 +00:00
search_results.jsx Add a new `@/` alias for the root frontend directory and use it where possible (#28753) 2024-01-16 10:27:26 +00:00
text_icon_button.jsx Fix width of large text icon buttons (#27127) 2023-09-25 15:06:57 +02:00
upload.jsx Change design of compose form in web UI (#28119) 2024-01-25 15:41:31 +00:00
upload_button.jsx Add end-to-end test for OCR in media uploads (#29148) 2024-02-08 19:13:44 +00:00
upload_form.jsx Change design of compose form in web UI (#28119) 2024-01-25 15:41:31 +00:00
upload_progress.jsx Change design of compose form in web UI (#28119) 2024-01-25 15:41:31 +00:00
warning.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00