me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
10944 commits 2 branches 0 tags 429 MiB
Commit graph

13 commits

Author SHA1 Message Date
Thibaut Girka
e859334b33 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/application_controller.rb
  Minor conflict due to glitch-soc's theming system
 2019-12-12 15:40:06 +01:00
Eugen Rochko
37795253fc Revert "Fix an eslint warning (#12426)" (#12596) 
This reverts commit b93456fd64.
 2019-12-10 19:39:02 +01:00
Thibaut Girka
2cc60e8b09 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- package.json
  Not really a conflict, caused by an additional dependency in glitch-soc.
- yarn.lock
  Not really a conflict, caused by an additional dependency in glitch-soc.
 2019-12-07 12:28:59 +01:00
ThibG
c53ba20166 Fix poll options not being selectable via keyboard (#12538) 
* Fix poll options not being selectable via keyboard

Fixes #12384

* Improve styling of poll option checkboxes/radio buttons

* Use more appropriate ARIA roles for poll options

* Allow switching between single and multiple choice from keyboard

* Coding style

* Avoid using .bind()
 2019-12-03 19:53:16 +01:00
Thibaut Girka
5aa79af7cb Merge branch 'master' into glitch-soc/merge-upstream 2019-11-23 19:03:01 +01:00
Dimitri Merejkowsky
b93456fd64 Fix an eslint warning (#12426) 2019-11-22 15:57:22 +01:00
Thibaut Girka
0fc784f8d0 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
aa21aeb838 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
42a4f549d9 Increase poll option length limit to 100 chars, number of options to 5 2019-10-10 20:13:59 +02:00
ThibG
5cf2f8c646 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
eb80c3924f Allow switching between singe-option and multiple-option polls (#10603) 2019-04-22 14:56:14 +02:00
Eugen Rochko
55b8a88419 Fix scrollbar styles on compose textarea, small bugs (#10292) 2019-03-16 20:10:42 +01:00
Eugen Rochko
a15b0dc600 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