7 Commits

Author	SHA1	Message	Date
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
ThibG	7cdb8c10e9	Minor improvements to poll composing UI (#12319) ... - Disable the “add option” button instead of hiding it - Allow poll option inputs to scale to full width	2019-11-07 09:06:06 +02:00
Thibaut Girka	b3dd0d276d	Increase poll option length limit to 100 chars, number of options to 5	2019-10-10 20:13:59 +02:00
ThibG	f2be71c293	Add emoji suggestions to CW and poll option fields (#10555) ... * Refactor selectComposeSuggestion so that different paths can be updated * Add suggestions in CW field * Add emoji suggestion to poll options * Attempt to fix CSS * Hide suggestions by default They will be enabled if the input has focus	2019-05-09 22:10:27 +02:00
ThibG	0e78862b61	Allow switching between singe-option and multiple-option polls (#10603)	2019-04-22 14:56:14 +02:00
Eugen Rochko	6a3f08661f	Fix scrollbar styles on compose textarea, small bugs (#10292)	2019-03-16 20:10:42 +01:00
Eugen Rochko	d97cbb0da6	Add UI for creating polls (#10184) ... * Add actions and reducers for polls * Add poll button * Disable media upload if poll enabled * Add poll form * Make delete & redraft work with polls	2019-03-06 04:53:37 +01:00