Commit Graph

95 Commits

Author SHA1 Message Date
KDSBrowne
3e9c858717 update smart slides to detect user response poll 2022-10-11 19:11:04 +00:00
Ramón Souza
a924aecc1d fix multiple answer translation in live results 2022-09-14 09:51:48 -03:00
Ramón Souza
246e3b3e8f move button component to common folder 2022-02-14 20:20:50 +00:00
Ramón Souza
d1c516fef6 resolve html5 conflicts 2021-12-10 21:07:35 +00:00
Anton Georgiev
797fc49633 TEMP 2021-12-09 20:37:05 +00:00
João Victor Nunes
4868822216
fix: publish button for user response polls (#13638)
* fixes publish button for user response polls
Co-authored-by: Joao Victor <joaov@imdt.com.br>
2021-11-04 15:12:41 -04:00
Ramón Souza
efdec5da53 convert poll live-result component 2021-11-04 12:49:04 +00:00
Anton Georgiev
022f125e15 Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24-dev 2021-10-29 13:24:51 +00:00
Anton Georgiev
0a44cf0ebb
Merge branch 'v2.4.x-release' into discart-poll-button 2021-10-26 12:35:30 -04:00
Max Franke
1e3c5d1b65 feat(poll): add cancel poll button
Add a new button that adds the option to cancel the polling and its results.
Avoiding the user from having to close the poll, and open another in the
actions bar.
2021-10-26 10:45:52 -03:00
Anton
1ab6ae8741 realocates tests to the right file; fixes publishPoll button element; provides closePages util function 2021-10-19 17:15:18 -03:00
Ramón Souza
1cc066366f Merge remote-tracking branch 'upstream/develop' into PR-11359 2021-10-19 16:41:36 +00:00
Ramón Souza
8eb274f8ae calculate poll vote pct on current votes - live result 2021-10-08 11:42:58 +00:00
Ramon Souza
85ded998f2 remove linting 2021-09-17 11:03:09 -03:00
Ramon Souza
0ca1b7896e Merge remote-tracking branch 'upstream/develop' into PR-11359 2021-09-17 09:12:43 -03:00
Anton Georgiev
60d3248cb4
Merge pull request #13038 from antonbsa/fix-tests-with-files-and-update-breakout
test: Fix tests with files and update breakout
2021-08-30 14:32:33 -04:00
Ramon Souza
2a80a9753a improve poll live results layout 2021-08-30 13:45:24 -03:00
Ramon Souza
bed369d2d1 break lines in live result button 2021-08-18 17:46:04 -03:00
Anton
ccba36f57d fix polling test 2021-08-16 23:04:17 -03:00
germanocaumo
349af23f0a Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into anonymous-polls 2021-06-16 21:54:28 +00: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
13ae19bc3d Use currentPoll instead of state to determine if live results should be rendered
To avoid re-rendering of the poll answers when the poll panel is opened and closed,
this commit uses the currentPoll object to determine wether results should be rendered.
2021-06-07 10:56:14 +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
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
eafa260320
Merge pull request #12347 from jfsiebel/start-poll-after-publish-button
Improve Start A Poll button after publishing poll results
2021-05-19 23:28:17 -04:00
germanocaumo
04bd5c36b1 fix(poll): fix question title overflow
improve done translation in pt_br
2021-05-11 18:37:08 +00:00
Joao Siebel
90b54265e6 Improve Start A Poll button after publishing poll results 2021-05-11 11:22:08 -03:00
Michael Zinsmeister
5ca831ff86 Merged upstream develop branch 2021-05-01 16:59:20 +02:00
Ramon Souza
2264e2d322 get users data from context in poll live-result 2021-04-19 11:47:42 -03:00
Anton Georgiev
aae72c0547
Merge branch 'develop' into multiple-choice-poll 2021-03-29 11:54:44 -04:00
Ramon Souza
6a2496fcb3 Merge remote-tracking branch 'upstream/develop' into improve-poll-function 2021-03-24 14:22:43 -03:00
Michael Zinsmeister
5fb33d5224 merge upstream develop branch into current 2021-03-23 18:01:11 +01:00
Simon Hirtreiter
07b8946b39 Merge commit develop into multiple-choice-poll 2021-03-23 09:38:45 +01:00
Maxim Khlobystov
5adb3429eb Make typed poll responses grouping case insensitive 2021-03-23 06:30:37 +00:00
Ramon Souza
1df849a218 show poll question in polling panel 2021-03-18 14:16:32 -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
214b236701 Merge with upstream 2021-03-07 15:12:49 +01:00
Ramon Souza
043fa4bac8 fix user-sent poll result messages 2021-02-19 10:57:11 -03: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
Michael Zinsmeister
eaa6f0260c Fix poll results and add locale entries 2021-02-08 10:57:39 +01:00
Simon Hirtreiter
7fde9519d4 modify poll response to use array 2021-02-04 17:54:50 +01:00
KDSBrowne
4fbf46ff3f add minor UI updates from designs 2020-09-21 22:52:38 +00:00
KDSBrowne
d32155cc5f add new poll type | allow typed responses | update UI 2020-09-21 12:07:36 +00:00
Joao Siebel
b2adffa4c2 Merge remote-tracking branch 'upstream/develop' into connection-manager 2020-09-18 16:30:20 -03:00
KDSBrowne
77b71a4d1f fix duplicate css variables being loaded (improve imports) 2020-09-01 18:46:13 +00:00
Joao Siebel
f33bd10640 Remove user from collection when leaves 2020-08-19 13:22:43 -03:00
KDSBrowne
6872a07d04 fix chat poll result calculation to match whiteboard 2020-07-28 19:22:05 +00:00
Pedro Beschorner Marin
526f79e8f2 Merge remote-tracking branch 'bigbluebutton/v2.2.x-release' into bigbluebutton/develop 2020-06-30 18:15:18 -03:00
KDSBrowne
d19c941bf3 remove - as default response placeholder in poll results 2020-06-04 12:18:49 +00:00