tootlab-mastodon/app/javascript/mastodon/features/compose/components
Thibaut Girka ab5ff638f2 Merge branch 'master' into glitch-soc/master
Conflicts:
- `config/locales/en.yml`
  No real conflict, upstream added a translatable string “too close” to
  one specific to glitch-soc
- `lib/mastodon/statuses_cli.rb`
  Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses
- `package.json`
  No real conflict, additional dependency in glitch-soc
2019-12-19 13:52:54 +01:00
..
action_bar.js Add confirmation modal when logging out from the web app (#11671) 2019-08-26 18:24:10 +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 commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream 2019-07-07 13:49:31 +02:00
emoji_picker_dropdown.js Add categories for custom emojis (#11196) 2019-06-28 15:54:10 +02:00
navigation_bar.js Add confirmation modal when logging out from the web app (#11671) 2019-08-26 18:24:10 +02:00
poll_button.js Add UI for creating polls (#10184) 2019-03-06 04:53:37 +01:00
poll_form.js Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01:00
privacy_dropdown.js Improve keyboard navigation in privacy dropdown (#11492) 2019-08-06 11:59:58 +02:00
reply_indicator.js List attachments in reply indicator and boost modal (#10997) 2019-06-13 17:04:52 +02:00
search.js Scroll into search bar when focus (#12032) 2019-10-01 19:19:10 +02:00
search_results.js Add search results pagination to web UI (#11409) 2019-07-27 05:49:50 +02:00
text_icon_button.js Change icon button styles to make hover/focus states more obvious (#11474) 2019-08-03 19:10:50 +02:00
upload.js Add media editing modal (#11563) 2019-08-14 04:07:32 +02:00
upload_button.js Change camera icon to paperclip icon in upload form (#11149) 2019-06-22 15:29:25 +02:00
upload_form.js Add OCR tool to media editing modal (#11566) 2019-08-15 15:13:26 +02:00
upload_progress.js Add OCR tool to media editing modal (#11566) 2019-08-15 15:13:26 +02:00
warning.js Add option to reduce motion (#5393) 2017-10-16 09:36:15 +02:00