chuckya/app/javascript/mastodon/features/compose/components
Claire 0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.
2022-11-06 09:50:41 +01:00
..
action_bar.js Change layout of posts in web UI (#19423) 2022-10-25 19:02:21 +02:00
autosuggest_account.js Display full username in tooltip on search and autosuggest #7478 (#7920) 2018-07-01 04:16:13 +02:00
character_counter.js Count all URLs in text as 23 characters flat, do not count domain part of usernames (#4427) 2017-07-29 00:06:29 +02:00
compose_form.js Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
emoji_picker_dropdown.js Fix compose form submission reloading web interface (#19762) 2022-11-05 13:43:37 +01:00
language_dropdown.js Fix compose form submission reloading web interface (#19762) 2022-11-05 13:43:37 +01:00
navigation_bar.js Change layout of posts in web UI (#19423) 2022-10-25 19:02:21 +02:00
poll_button.js Add UI for creating polls (#10184) 2019-03-06 04:53:37 +01:00
poll_form.js Merge branch 'main' into glitch-soc/merge-upstream 2022-11-06 09:50:41 +01:00
privacy_dropdown.js Change “Only people I mention” to “Mentioned people only” (#18291) 2022-05-03 12:30:40 +02:00
reply_indicator.js Change routing paths to use usernames in web UI (#16171) 2021-09-26 05:46:13 +02:00
search.js Fix logged out search and changed logged-in search placeholder (#19514) 2022-10-29 13:32:49 +02:00
search_results.js Fix button to dismiss suggestions not showing up in search results (#19325) 2022-10-09 12:28:59 +02:00
text_icon_button.js Fix compose form submission reloading web interface (#19762) 2022-11-05 13:43:37 +01:00
upload.js Fix JavaScript console error on upload editing status (#19769) 2022-11-05 13:43:47 +01:00
upload_button.js Improve wording of the “Add media” button tooltip (#13954) 2020-06-26 00:14:29 +02:00
upload_form.js Fix upload progress not communicating processing phase in web UI (#19530) 2022-10-29 20:05:53 +02:00
upload_progress.js Fix upload progress not communicating processing phase in web UI (#19530) 2022-10-29 20:05:53 +02:00
warning.js Add option to reduce motion (#5393) 2017-10-16 09:36:15 +02:00