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 85558a5e18 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Minor upstream change, our README is completely different.
  Kept ours.
- `lib/tasks/assets.rake`:
  glitch-soc has extra code to deal with its theming system,
  upstream changed a line that exists in glitch-soc.
  Applied upstream changes.
 		2023-02-09 12:46:12 +01:00
..
action_bar.js Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
autosuggest_account.js
…
character_counter.js
…
compose_form.js Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01:00
emoji_picker_dropdown.js Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
language_dropdown.js Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
navigation_bar.js Change in-app links to keep you in-app (#20540) 2022-11-13 21:10:20 +01:00
poll_button.js Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
poll_form.js Merge branch 'main' into glitch-soc/merge-upstream 2023-02-09 12:46:12 +01:00
privacy_dropdown.js Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
reply_indicator.js Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
search.js Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01: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 Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01:00
upload_button.js Upgrade ESlint to v8 (#23305) 2023-01-30 01:45:35 +01: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
…