1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-14 22:59:46 +09:00
YuruToot/app/javascript/mastodon/features/compose/components
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 Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
character_counter.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
compose_form.jsx Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream 2023-10-25 12:14:24 +02:00
emoji_picker_dropdown.jsx Change emoji picker icon (#25479) 2023-06-21 17:58:00 +02:00
language_dropdown.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
navigation_bar.jsx Change eslint config to autofix missing comma and indentation in JS files (#26711) 2023-10-09 13:38:29 +02:00
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_results.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
text_icon_button.jsx Fix width of large text icon buttons (#27127) 2023-09-25 15:06:57 +02:00
upload_button.jsx Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
upload_form.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
upload_progress.jsx Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
upload.jsx Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00
warning.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00