luna
/
mastodon
mirror of https://github.com/lunaisnotaboy/mastodon.git
0
0
Fork 0
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript/mastodon/features/compose/components
History
Claire 6c99479ef4 Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
  Upstream redesigned the settings page, where glitch-soc had changes because of
  the ability to set some custom limits.
  Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
  Upstream updated dependencies textually close to a glitch-soc-only dependency.
  Updated the dependnencies as well.
 		2023-06-18 13:41:33 +02:00
..
action_bar.jsx Update inconsistent `defaultMessage` (#25114) 2023-05-24 12:38:50 +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 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream 2023-05-28 15:54:31 +02:00
emoji_picker_dropdown.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
language_dropdown.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
navigation_bar.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +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 Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
search.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
search_results.jsx Rewrite `<LoadMore />` as FC and TS (#25259) 2023-06-06 11:28:50 +02:00
text_icon_button.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
upload.jsx Fix non-interactive upload container being given a `button` role and tabIndex (#25462) 2023-06-16 12:03:06 +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
warning.jsx Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00