rubiline
/
Glitch-Shrike
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Glitch-Shrike/app/javascript/mastodon/features/compose/components
History
Claire ba527c071f Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
  Upstream changed how icons are handled, including on a line modified by
  glitch-soc to bump the number of poll options.
  Applied upstream's change, while keeping the increased number of poll
  options.
 		2023-10-25 12:14:24 +02:00
..
action_bar.jsx Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
autosuggest_account.jsx
…
character_counter.jsx
…
compose_form.jsx Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream 2023-10-25 12:14:24 +02:00
emoji_picker_dropdown.jsx
…
language_dropdown.jsx
…
navigation_bar.jsx
…
poll_button.jsx Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
poll_form.jsx Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream 2023-10-25 12:14:24 +02:00
privacy_dropdown.jsx Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
reply_indicator.jsx Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
search.jsx Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
search_results.jsx Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
text_icon_button.jsx
…
upload.jsx Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
upload_button.jsx Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
upload_form.jsx
…
upload_progress.jsx Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
warning.jsx
…