BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,531 Commits 13 Branches 260 Tags 1.1 GiB
e928f13ea0
Commit Graph

78 Commits

Author SHA1 Message Date
Ramon Souza
be4cfb3c9a remove unused code 2021-09-21 13:04:15 -03:00
Ramon Souza
c892a2a5d1 resolve conflicts 2021-09-21 12:06:27 -03:00
Ramon Souza
0ca1b7896e Merge remote-tracking branch 'upstream/develop' into PR-11359 2021-09-17 09:12:43 -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
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
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
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
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
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
Anton Georgiev
f34826718d include instanceId in resources url 2020-11-30 16:09:35 +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
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
58480d58d6 remove tooltip from poll answers 2019-08-27 17:15:48 +00:00
Joao Siebel
15f3623e61 disable poll action when meteor is disconnected 2019-06-27 13:46:14 -03:00
KDSBrowne
aa2ec33afb localize default poll answers 2019-05-22 18:00:44 +00: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
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