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

271 Commits

Author SHA1 Message Date
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
Anton Georgiev
e01bdf69c5 Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into june2-merge-into-develop 2021-06-02 18:45:31 +00:00
germanocaumo
5c7fa6ece5 fix: export poll chat message 
Include the new poll text in the chat export function.
Refactor some chat type constants.
Also fixes empty lines in the export chat file.
 2021-05-29 00:28:47 +00: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
Vitor Mateus De Almeida
ede57507ef Merge remote-tracking branch 'upstream/develop' into layoutManagerNew 2021-05-21 14:56:10 -03: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
Vitor Mateus De Almeida
047b573d10 Fix auto resize when open/close panels 2021-05-19 19:29:03 -03:00
Vitor Mateus De Almeida
88a1edcc06 Fix userlist item button, Fix polling close button 2021-05-19 11:51:31 -03:00
Vitor Mateus De Almeida
1326f3f791 Add New Layout Manager 2021-05-17 17:25:07 -03: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
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
Ramon Souza
6fc4699097 show message when starting poll without active presentation 2021-05-10 14:34:23 -03: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
Anton Georgiev
e00b7efb04
Merge pull request #12165 from vitormateusalmeida/issue-12050 
Fix layout broken after open+close shared notes
 2021-04-27 11:11:17 -04:00
Vitor Mateus De Almeida
70a7687574 remove commented code 2021-04-27 11:37:33 -03:00
Vitor Mateus De Almeida
340e0ba052 fix layout broken after opne close shared notes 2021-04-26 20:04:34 -03:00
Ramon Souza
85de789629 fix long poll question 2021-04-23 16:10:43 -03:00
Ramon Souza
98b5659f23 fix new poll button sizes 2021-04-23 13:33:54 -03:00
Ramon Souza
2264e2d322 get users data from context in poll live-result 2021-04-19 11:47:42 -03:00
Anton Georgiev
2955fed194
Merge pull request #11895 from MaximKhlobystov/sync-options-length-dragndrop 
Syncing the length of poll options list with the drag and drop input
 2021-04-12 13:48:39 -04:00
Maxim Khlobystov
1da39201a8 Fix for addition and removal of options in drag and drop poll creation 2021-04-12 00:40:46 +00:00
Ramon Souza
b4f91f443e fix new poll key warning 2021-04-08 15:42:06 -03:00
hiroshisuga
b0d668b4db
Fire layout rearrangement by toggling poll panel (#11900) 2021-04-07 08:36:09 -04:00
Maxim Khlobystov
11fe501214 Avoid going over the maximum allowed number of poll responses 2021-04-05 19:41:26 +00:00
Anton Georgiev
c9d2a17a4f
Merge branch 'develop' into multiple-choice-poll 2021-03-30 13:23:48 -04:00
Maxim Khlobystov
7fa1dc3128 Changge the style of selected User Response poll button 2021-03-30 16:52:14 +00:00
Maxim Khlobystov
9d4bd0e199 Syncing the number of poll options with the drag and drop input 2021-03-30 14:33:57 +00:00
Anton Georgiev
aae72c0547
Merge branch 'develop' into multiple-choice-poll 2021-03-29 11:54:44 -04:00
Maxim Khlobystov
ea5d5a879c Avoid displaying drag and drop input field for typed response polls 2021-03-25 01:37:25 +00: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
Michael Zinsmeister
b99bd3be0c Merged upstream develop branch 2021-03-14 22:17:19 +01:00
Mohamed Amine Ben Salah
36ba0c5bb6 Merge remote-tracking branch 'upstream/develop' into update-and-add-polling-specs 2021-03-11 09:16:55 -03:00
Maxim Khlobystov
619c5ed176 Make the poll drag and drop feature optional 2021-03-10 18:23:25 +00: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
e52df55bf8 fix bug 2021-03-07 18:11:57 +01:00
Michael Zinsmeister
214b236701 Merge with upstream 2021-03-07 15:12:49 +01:00
Maxim Khlobystov
e3ec0da0a9 Deleted unused code left from the 2.2 implementation of the drag and drop for poll options 2021-03-04 22:04:38 +00:00
Maxim Khlobystov
e8229726f2 Make the drag-and-drop properly work with 2.3 polling 2021-03-04 19:43:43 +00:00
gersti07
3fae071001 Update styles.scss 2021-03-04 19:26:18 +00:00
gersti07
885a8f2598 improved button style 2021-03-04 19:25:53 +00:00
gersti07
09e8e7353d removed unused code 2021-03-04 19:25:22 +00:00
gersti07
dd68990c7b removed unused code from styles.scss 2021-03-04 19:24:47 +00:00
gersti07
6011eb524a refactor drag handling 2021-03-04 19:24:07 +00:00
gersti07
b36042babd implemented add polloptions via drag and drop 
(merging with 2.3)
 2021-03-04 19:20:17 +00:00
Ramon Souza
043fa4bac8 fix user-sent poll result messages 2021-02-19 10:57:11 -03:00
KDSBrowne
9aff7ea22b add yes / no / abstention poll btn 2021-02-18 16:06:21 +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
70fc71cc70 Merge remote-tracking branch 'upstream/develop' into multiple-choice-poll 
# Conflicts:
#	bbb-common-message/src/main/scala/org/bigbluebutton/common2/domain/Meeting2x.scala
 2021-02-08 17:00:36 +01:00
Simon Hirtreiter
fef95c8548 use checkbox for poll settings and style 2021-02-08 12:01:53 +01:00
Michael Zinsmeister
eaa6f0260c Fix poll results and add locale entries 2021-02-08 10:57:39 +01:00
KDSBrowne
852ea929a8 add default poll color for chat results 2021-02-05 16:29:58 +00:00
Simon Hirtreiter
7fde9519d4 modify poll response to use array 2021-02-04 17:54:50 +01:00
Simon Hirtreiter
1c4186d7fd update bbb-html5 for multiple choice 
Signed-off-by: Simon Hirtreiter <s.hirtreiter@hm.edu>
 2021-02-04 14:59:16 +01:00
Anton Georgiev
09e6ba8dfd Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-Jan30 2021-01-29 20:58:05 +00:00
werk21
80af96ff76 9101: Survey: New profile yes/no/abstention 2021-01-24 02:22:40 +01: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
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
cace862c01 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into issue-9861 2020-08-11 14:06:02 +00:00
KDSBrowne
4ef489795c Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into issue-9861 2020-08-04 12:59:30 +00:00
KDSBrowne
9dcd3b3f61 remove const function and move into export 2020-08-03 21:35:12 +00:00
KDSBrowne
6872a07d04 fix chat poll result calculation to match whiteboard 2020-07-28 19:22:05 +00:00
KDSBrowne
1ad09b7046 fix poll chat message grouping / unread counter not updating for polls 2020-07-28 12:55:21 +00:00
KDSBrowne
0fdd1dc978 allow start / stop of polls with no presentation 2020-07-20 14:34:46 +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
Mohamed Amine Ben Salah
23182917ee adds poll notification test spec 2020-03-20 11:42:04 -03:00
Anton Georgiev
0958e422aa
Merge pull request #8485 from KDSBrowne/move-quick-poll 
Move quick poll button to presentation tool bar
 2020-03-09 18:05:32 -04:00
Anton Georgiev
3754d0ab6f Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-master-feb-28-2020 2020-02-28 17:47:06 -05:00
Anton Georgiev
1fa426058f corrected issues related to publishing and methods 2020-02-13 14:19:29 -05:00
Anton Georgiev
a8f4827af8 utilize Meteor connection id instead of trusting client side meetingId, userId 2020-02-06 15:48:16 -05:00
KDSBrowne
4ab2d7ba4b prevent text pasted in chat displaying as poll result 2020-02-03 18:07:42 +00:00
KDSBrowne
b815272708 disable quick poll when active poll / make menu item use full width 2020-01-29 18:36:17 +00:00
KDSBrowne
07ae123a65 update chat poll message styling 2020-01-24 17:16:05 +00:00
KDSBrowne
d03b5641e4 add published poll results to the public chat 2020-01-22 14:30:16 +00:00
Anton Georgiev
4a335a1db6 reduce db probes for getAvailableActions; simplify SaveUsernames 2019-09-06 16:28:02 -04:00
Anton Georgiev
c5856d43c8 moved static code outside of tracker 2019-09-04 14:32:58 -04:00
Anton Georgiev
ea18b09311 add a few more collection lookups "fields" delimiters 2019-08-29 12:26:07 -04:00
Anton Georgiev
892336632f added "fields:{...}", removed most mapUser 2019-08-28 16:32:55 -04:00
KDSBrowne
220afa2f0d switch PureComponent with Component for Poll / lint issues 2019-07-08 22:57:10 +00:00
Joao Siebel
18670fdaf2 Merge remote-tracking branch 'upstream/master' into reconnection-improvement 2019-07-04 15:09:06 -03:00
Joao Siebel
15f3623e61 disable poll action when meteor is disconnected 2019-06-27 13:46:14 -03:00
KDSBrowne
ceaeef0227 fix remaining reported accessibility issues 2019-06-26 03:03:08 +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
Anton Georgiev
528c43cff5
Merge pull request #7407 from KDSBrowne/_summit-fix-starting-poll-with-space-option 
Add disabled prop to start custom poll button
 2019-05-10 10:12:43 -04:00
KDSBrowne
035510caad add disabled prop to start custom poll btn 2019-05-09 18:40:49 +00:00
KDSBrowne
c5f80f8f4c fix for issue 7386 2019-05-08 20:31:24 +00:00
Anton Georgiev
a987a38af3
Merge pull request #7366 from KDSBrowne/_summit-move-focus-to-poll-panel 
Move focus to poll panel when opened
 2019-05-07 16:14:42 -04:00
KDSBrowne
5a4938259c add check for findDOMNode element 2019-05-07 20:09:52 +00:00
KDSBrowne
adea7b90e6 move focus to poll panel when open 2019-05-07 20:04:55 +00:00
KDSBrowne
2b5bd65273 fix color contrast in poll pane 2019-05-07 19:12:40 +00:00
Anton Georgiev
128e0b9cec
Merge branch 'master' into 2.2-High-contrast-outline 2019-05-06 15:55:59 -04:00
KDSBrowne
524c354bc6 show correct waiting message on poll publish 2019-04-22 18:27:59 +00:00
KDSBrowne
0e724fb890 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into 2.2-High-contrast-outline 2019-04-18 14:29:17 +00:00
KDSBrowne
c05668a519 add waiting / done messages 2019-04-17 16:36:04 +00:00
KDSBrowne
596c68b54b fix formatting in users / response columns 2019-04-16 02:03:01 +00:00
KDSBrowne
393a0eb5ac reduce space between result list entries 2019-04-15 18:20:57 +00:00
KDSBrowne
7a0cea27d9 improve polling live result design / sorting 2019-04-14 20:23:14 +00:00
KDSBrowne
38ba8f8895 add outlines for high contrast themes (windows) 2019-04-08 14:22:22 +00:00
KDSBrowne
ea62805ea3 move const variables 2019-04-02 04:07:45 +00:00
KDSBrowne
2e0e2a98a7 fix for issue #6682 / make poll panel resizable 2019-03-28 15:58:10 +00:00
KDSBrowne
341ca37add fix for issue #7027 2019-03-14 19:34:53 +00:00
Tainan Felipe
e91859b816 Fix poll exception when no presentation selected 2019-03-08 17:46:25 -03:00
Anton Georgiev
5776e9b432
Merge pull request #6716 from KDSBrowne/2.2-SR-cust-poll-options 
Make SR announce poll inputs individually
 2019-02-13 09:55:23 -05:00
KDSBrowne
7aa16a2d4b prevent SR announcing poll inputs as one element 2019-02-02 03:56:15 +00:00
KDSBrowne
749a609565 fix minor accessibility issues 2019-01-28 13:33:50 +00:00
KDSBrowne
48fbf8ce5d keep poll result pane open after publishing 2019-01-16 18:25:24 +00:00
KDSBrowne
86c7e745c5 fix lint errors 2018-12-18 15:15:51 +00:00
KDSBrowne
6d2836dfd3 clean up poll container render() 2018-11-23 04:08:48 +00:00
KDSBrowne
99e15b20ba add panel manager component 2018-11-19 23:29:48 +00:00
KDSBrowne
9e483a181e move live-result sort to service 2018-11-01 18:20:35 +00:00
KDSBrowne
deac142296 move check for non presenter 2018-11-01 15:53:34 +00:00
KDSBrowne
ecf0304a01 move poll container functions to service 2018-10-31 19:13:19 +00:00
KDSBrowne
38ae789b4a fix userlist poll heading remaining after presenter toggle 2018-10-31 17:28:35 +00:00
KDSBrowne
0e26d2a6c1 add early returns to renderPollStats() 2018-10-31 13:28:32 +00:00
KDSBrowne
a8ef2cb8b5 rename getPollStats and getInputFields 2018-10-31 13:18:33 +00:00
KDSBrowne
291461d4fd add sort to users in live-results 2018-10-30 20:05:56 +00:00
KDSBrowne
b95e3a7825 condense getRespondents and getUnresponsive into single function 2018-10-30 19:18:32 +00:00
KDSBrowne
76e3759039 add formated message 2018-10-30 15:57:10 +00:00
KDSBrowne
ee41c0bd93 adjust variable names / remove duplicate return 2018-10-30 13:17:40 +00:00
KDSBrowne
78a5ff6fc9 edit poll pane close btn 2018-10-29 16:14:05 +00:00
KDSBrowne
bba899c4a7 prevent poll closing on poll pane hide 2018-10-29 15:27:50 +00:00
KDSBrowne
4462e050ee fix polling title misalignment 2018-10-26 12:49:14 +00:00
KDSBrowne
0551691684 edit css styles 2018-10-26 01:40:15 +00:00
KDSBrowne
2b61b8a2a0 fix style conflict 2018-10-25 18:23:43 +00:00
KDSBrowne
188118d9ea Merge branch 'test-merge-anton' into t 2018-10-25 18:19:25 +00:00
KDSBrowne
da30345649 fix style issues after merge 2018-10-25 17:44:03 +00:00
KDSBrowne
5c62507f0e prevent offline users being displayed in live results 2018-10-25 17:20:32 +00:00
KDSBrowne
ec5af5b855 fix merge issues 2018-10-25 16:54:29 +00:00
KDSBrowne
de51ab6fd6 position polling in center screen for mobile 2018-10-25 16:07:24 +00:00
KDSBrowne
abd5e8a224 update styling / fix bugs 2018-10-24 14:17:13 +00:00
KDSBrowne
c191d3b6e8 clean up styles values 2018-10-18 14:59:26 +00:00
KDSBrowne
c8b993a3a9 remove use of router in polling 2018-10-18 14:31:17 +00:00