Thibaut Girka 83774367d2 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`
  conflict because of the poll option limit being different than upstream's

2019-11-07 13:43:56 +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

…

character_counter.js

…

compose_form.js

…

emoji_picker_dropdown.js

…

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

…

poll_form.js

Merge branch 'master' into glitch-soc/merge-upstream

2019-11-07 13:43:56 +01:00

privacy_dropdown.js

Improve keyboard navigation in privacy dropdown (#11492)

2019-08-06 11:59:58 +02:00

reply_indicator.js

…

search_results.js

Add search results pagination to web UI (#11409)

2019-07-27 05:49:50 +02:00

search.js

Scroll into search bar when focus (#12032)

2019-10-01 19:19:10 +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_button.js

…

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

upload.js

Add media editing modal (#11563)

2019-08-14 04:07:32 +02:00

warning.js

…