1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-15 07:09:03 +09:00
YuruToot/app/javascript/mastodon/features/compose/components
Claire b0c76eaadd Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream changed one import, close to a glitch-soc-only import to handle
  different max character counts.
  Ported upstream's change.
2023-10-24 18:41:20 +02:00
..
action_bar.jsx Replace 'favourite' by 'favorite' for American English (#26009) 2023-07-21 19:09:13 +02: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 '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream 2023-10-24 18:41:20 +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 Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
poll_form.jsx Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream 2023-05-28 15:54:31 +02:00
privacy_dropdown.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
reply_indicator.jsx Upgrade to react-router v5 (#25047) 2023-10-19 19:44:55 +02:00
search_results.jsx Add infinite scrolling for search results in web UI (#26784) 2023-09-05 23:54:24 +02:00
search.jsx Upgrade to react-router v5 (#25047) 2023-10-19 19:44:55 +02:00
text_icon_button.jsx Fix width of large text icon buttons (#27127) 2023-09-25 15:06:57 +02:00
upload_button.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
upload_form.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
upload_progress.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
upload.jsx Upgrade to react-router v5 (#25047) 2023-10-19 19:44:55 +02:00
warning.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00