Commit Graph

187 Commits

Author SHA1 Message Date
germanocaumo
31138d440e fix(poll): readd userId for non secret poll record event 2021-06-16 17:01:56 +00:00
Anton Georgiev
062db71e92
Merge pull request #12561 from germanocaumo/answers-tarnslation-12546
fix(poll): don't translate user/presenter typed answers
2021-06-12 16:54:12 -04:00
Ramon Souza
b67e8ce7bf css fixes 2021-06-11 14:36:06 -03:00
germanocaumo
7bedcb08e5 fix(poll): don't translate user/presenter typed answers
When the answer is not default (Custom or UserResponse), don't translate the answers.
2021-06-11 16:55:53 +00:00
tibroc
306beff1d1 add better user explanations and remaining differences to #12435
PR #12435 was slightly different than #12430 but especially had better explanations for users.
This commit incorporates the remaining ideas from that PR.
2021-06-07 11:01:34 +02:00
tibroc
828cf60cb2 Add option to hide individual answers in polls
This patch adds a new option to hide the individual answers to the presenter
when starting a poll. This includes hiding the answers for the presenter and
informing the other users that the current poll is anonymous.

See #9524
2021-06-07 10:56:14 +02:00
Pedro Beschorner Marin
10e29f3832
Merge pull request #12451 from germanocaumo/poll-chat-translation
fix: translate poll answer key for default polls in chat message
2021-05-27 15:21:57 -03:00
germanocaumo
4d62f8a971 fix: translate poll answer key for default polls 2021-05-27 18:16:11 +00:00
germanocaumo
c213b88451 refactor(poll): improve poll types code
this also fixes certain poll type detection for other languages than english,
so that the correct poll type is sent in the events (they were being detected as custom)
2021-05-26 17:52:55 +00:00
germanocaumo
3a9e9c1358 refactor: redo how poll result chat message is done +
Fix prolems with ":" char in answers.
Respect poll question formatting (lineBreaks/spaces) in other fields of UI
2021-05-20 14:53:52 +00:00
Anton Georgiev
1bc324b657
Merge pull request #12353 from germanocaumo/poll-record-improvs
Recorded polling events improvements
2021-05-13 13:43:36 -04:00
germanocaumo
ca2ad30e12 fix(record): add missing info to polling events
Add PollPublishedRecordEvent with all infos (also fix duplicated handlePollStoppedEvtMsg)
Add answer text to UserRespondedToPollRecordEvent (useful for custom answers)
Add type in PollStartedRecordEvent
2021-05-11 18:37:23 +00:00
Ramon Souza
a35f38847c add scroll to poll question container - mobile 2021-05-07 15:39:40 -03:00
Michael Zinsmeister
efbc990c44 fix polling component 2021-05-01 22:50:24 +02:00
Michael Zinsmeister
5ca831ff86 Merged upstream develop branch 2021-05-01 16:59:20 +02:00
Joao Siebel
60f25939c0 Add configuration for max length typed answer in poll 2021-04-29 13:54:39 -03:00
Ramon Souza
858e1c7529 remove max-width from polling options container 2021-04-12 14:34:05 -03:00
Simon Hirtreiter
07b8946b39 Merge commit develop into multiple-choice-poll 2021-03-23 09:38:45 +01:00
Anton Georgiev
4e762c6ae9
Merge pull request #11574 from daminebenq/update-and-add-polling-specs
Update and add Polling specs
2021-03-17 18:40:12 -04:00
Michael Z
4d3bda1306
Merge branch 'develop' into multiple-choice-poll 2021-03-16 18:38:48 +01:00
Ramon Souza
adc48047a1 prevent sending typed poll empty response 2021-03-16 14:10:10 -03:00
Michael Zinsmeister
b99bd3be0c Merged upstream develop branch 2021-03-14 22:17:19 +01:00
Mohamed Amine Ben Salah
5fe7a18db4 Merge remote-tracking branch 'upstream/develop' into update-and-add-polling-specs 2021-03-11 17:38:49 -03:00
Ramon Souza
15fccf0ba1 submit typed polling response by pressing enter 2021-03-11 14:45:48 -03:00
Mohamed Amine Ben Salah
982ddc56a1 adds YNA and UR polling cases 2021-03-08 18:11:36 -03:00
Mohamed Amine Ben Salah
620183d5d3 added True/False, A/B/C/D polling cases WIP 2021-03-07 20:53:58 -03:00
Michael Zinsmeister
627b8737e1 improve multiple response polling view 2021-03-07 18:26:10 +01:00
Michael Zinsmeister
214b236701 Merge with upstream 2021-03-07 15:12:49 +01:00
Anton Georgiev
d3a33382fe
Propagate typo fix from #11432
Needed for https://github.com/bigbluebutton/bigbluebutton/pull/11432
2021-02-19 10:34:20 -05:00
Maxim Khlobystov
7a703464de Small misprint introduced in the merge 2021-02-09 06:22:41 +00:00
Maxim Khlobystov
ff4260dc98 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into updating-poll-ui 2021-02-08 21:41:43 +00:00
Simon Hirtreiter
63bad32f50 poll reponse update style 2021-02-08 14:37:34 +01:00
Simon Hirtreiter
ef76475785 disable send when nothing checked 2021-02-08 14:23:58 +01:00
Simon Hirtreiter
a08739898c fix checkbox bug correctly checked 2021-02-08 14:23:43 +01:00
Simon Hirtreiter
6a553a45ed fix checkbox bug correctly checked 2021-02-08 14:23:33 +01:00
Simon Hirtreiter
81572b64df use checkbox for poll response and style 2021-02-08 12:12:08 +01:00
Michael Zinsmeister
eaa6f0260c Fix poll results and add locale entries 2021-02-08 10:57:39 +01:00
Simon Hirtreiter
2001f21065 ad multiple choice to response ui 2021-02-04 18:55:18 +01:00
Simon Hirtreiter
7fde9519d4 modify poll response to use array 2021-02-04 17:54:50 +01:00
Simon Hirtreiter
9d27d980af pass isMultipleChoice threw UI services 2021-02-04 17:53:54 +01:00
Anton Georgiev
f34826718d include instanceId in resources url 2020-11-30 16:09:35 +00:00
Anton Georgiev
3faabd1821 Merge 2.2.29 and 2.2.30 into 2.3.x 2020-11-24 15:13:09 +00:00
KDSBrowne
d2cb02b3bd prevent users from being able to send more than 1 poll vote 2020-10-28 18:33:09 +00:00
KDSBrowne
73f890c9d8 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-updated-polling 2020-10-21 16:05:03 +00:00
Anton Georgiev
0c7ead1916 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into oct16-merge 2020-10-21 14:48:02 +00:00
Anton Georgiev
bf555dc047
Merge pull request #10564 from KDSBrowne/2.2-publishVote-error
Fix exception while invoking method 'publishVote'
2020-10-09 13:36:21 -04:00
Mario Jr
e9e436378a Correctly set audio input/output devices
When refusing ("thumbs down" button) echo test, user is able to select a different input device. This should work fine for chrome, firefox and safari (once user grants permission when asked by html5client).
For output devices, we depend on setSinkId function, which is enabled by default on current chrome release (2020) but not in Firefox (user needs to enable "setSinkId in about:config page). This implementation is listed as (?) in MDN.
In other words, output device selection should work out of the box for chrome, only.
When selecting an outputDevice, all alert sounds (hangup, screenshare , polling, etc) also goes to the same output device.
This solves #10592
2020-10-06 20:37:55 -03:00
KDSBrowne
e99292836f fix Match error: Expected object, got undefined in publishVote 2020-09-28 19:28:35 +00:00
KDSBrowne
4fbf46ff3f add minor UI updates from designs 2020-09-21 22:52:38 +00:00
KDSBrowne
cd34469e4c add max response poll input char length | prevent empty poll option 2020-09-21 16:00:05 +00:00
KDSBrowne
d32155cc5f add new poll type | allow typed responses | update UI 2020-09-21 12:07:36 +00:00
KDSBrowne
77b71a4d1f fix duplicate css variables being loaded (improve imports) 2020-09-01 18:46:13 +00:00
Anton Georgiev
4a335a1db6 reduce db probes for getAvailableActions; simplify SaveUsernames 2019-09-06 16:28:02 -04:00
Anton Georgiev
ea18b09311 add a few more collection lookups "fields" delimiters 2019-08-29 12:26:07 -04:00
Anton Georgiev
44e13bc38e
Merge pull request #7997 from KDSBrowne/issue-7992
Fix position of poll answers container in RTL
2019-08-28 14:51:58 -04:00
KDSBrowne
66f7ea474d remove space 2019-08-27 17:57:20 +00:00
KDSBrowne
58480d58d6 remove tooltip from poll answers 2019-08-27 17:15:48 +00:00
KDSBrowne
5c48e19a85 fix position of poll answers container for rtl 2019-08-26 20:08:40 +00:00
Joao Siebel
18670fdaf2 Merge remote-tracking branch 'upstream/master' into reconnection-improvement 2019-07-04 15:09:06 -03:00
KDSBrowne
ba9c9c431a add enabled poll prop in settings.yml 2019-07-02 14:54:37 +00:00
Joao Siebel
15f3623e61 disable poll action when meteor is disconnected 2019-06-27 13:46:14 -03:00
KDSBrowne
b8968411fb prevent menus being accessed when showing poll (small screens) 2019-06-17 14:23:36 +00:00
Diego Benetti
3998898319 Merge branch 'kert-pr-7498' into issue7461-localize-remaining-labels 2019-05-23 18:13:42 -03:00
KDSBrowne
aa2ec33afb localize default poll answers 2019-05-22 18:00:44 +00:00
Ghazi Triki
1f6326f7fd Change layout direction for RTL languages.
Update styles for RTL layout.
2019-05-14 14:17:19 +01:00
Chad Pilkey
51c6c65624
Merge pull request #7089 from KDSBrowne/2.2-Imp-poll-result
Improvements to poll panel and options
2019-04-02 13:45:07 -04:00
KDSBrowne
ea62805ea3 move const variables 2019-04-02 04:07:45 +00:00
Ghazi Triki
5b87524520 Use the embedded meteor CDN feature. 2019-03-29 16:47:07 +01:00
KDSBrowne
2e0e2a98a7 fix for issue #6682 / make poll panel resizable 2019-03-28 15:58:10 +00:00
Ghazi Triki
106058e1dd Support loading the HTML5 main JS file and its assets from a CDN. 2019-03-18 09:57:43 +01:00
KDSBrowne
3fc941bd49 prevent users interacting with elements behind polling modal like view 2018-10-29 16:57:19 +00:00
KDSBrowne
0551691684 edit css styles 2018-10-26 01:40:15 +00:00
KDSBrowne
c49b72f926 fix mobile poll response view 2018-10-25 18:33:02 +00:00
KDSBrowne
188118d9ea Merge branch 'test-merge-anton' into t 2018-10-25 18:19:25 +00:00
KDSBrowne
5d8c4dc909 change polling title color 2018-10-25 17:48:23 +00:00
KDSBrowne
da30345649 fix style issues after merge 2018-10-25 17:44:03 +00:00
KDSBrowne
95bb36df82 Merge remote-tracking branch 'Upstream/master' into start-poll-01 2018-10-25 17:25:26 +00:00
KDSBrowne
3f521a6f6a Merge branch 'html5-theming' into test-merge-anton 2018-10-25 16:33:56 +00:00
KDSBrowne
de51ab6fd6 position polling in center screen for mobile 2018-10-25 16:07:24 +00:00
KDSBrowne
e951b9180f prevent other menus covering polling options 2018-10-24 14:50:47 +00:00
KDSBrowne
abd5e8a224 update styling / fix bugs 2018-10-24 14:17:13 +00:00
Oswaldo Acauan
f71d32a464 Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning
WIP

wip

wip

format

wip

Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning
2018-10-23 14:21:58 -02:00
KDSBrowne
defaea03fd add sound notification when poll starts 2018-10-16 22:07:42 +00:00
KDSBrowne
94cdc0aee3 add sound notification when poll starts 2018-10-16 22:06:50 +00:00
KDSBrowne
6c377b97bf add formatted strings 2018-10-15 19:05:50 +00:00
KDSBrowne
262038520b improve styling / fix bugs 2018-10-15 14:36:26 +00:00
KDSBrowne
9b42940d63 move polling options for viewer 2018-10-12 15:05:53 +00:00
KDSBrowne
7673adee1b implement live results for poll 2018-10-10 15:52:39 +00:00
KDSBrowne
5f31deee11 use mq() instead of @media 2018-09-09 05:23:33 +00:00
KDSBrowne
bf38c36b71 fix polling answer position in safari on mobile 2018-08-31 17:14:00 +00:00
Oswaldo Acauan
8dea5de7fe Fix polling/webcams margins 2018-04-17 15:04:16 -03:00
Oswaldo Acauan
c688eb23ca Move Polling to above slides/webcams and change swapLayout constraints. Closes #5359 2018-04-17 14:55:07 -03:00
Oswaldo Acauan
c640c77101 Merge remote-tracking branch 'upstream/v2.0.x-release' into polls-styling 2018-04-13 16:05:15 -03:00
Oswaldo Acauan
62eae1188d Update the polling component styles
Add
2018-04-13 15:56:21 -03:00
KDSBrowne
61c4b65852 wrap polling btns in tooltip / remove showTip prop 2018-03-23 09:35:57 -07:00
KDSBrowne
b5a0368407 prevent text overflow on polling btns / add tooltips 2018-03-21 12:45:12 -07:00
KDSBrowne
7d0acb1ed8 add role=alert to polling options 2018-03-14 09:20:58 -07:00
Oleksandr Zhurbenko
ce1f40ac9a Updated Meteor to 1.6.0.1 2018-01-07 22:17:18 -08:00
Oleksandr Zhurbenko
962e659378 Switched the components from deprecated method to 2018-01-07 20:44:42 -08:00
Oleksandr Zhurbenko
561709644d Fixed a bug with props in the polling container 2017-11-06 10:24:10 -08:00