Ramon Souza
0ca1b7896e
Merge remote-tracking branch 'upstream/develop' into PR-11359
2021-09-17 09:12:43 -03:00
Ramon Souza
9300b9b382
Merge remote-tracking branch 'upstream/develop' into use-context-selector
2021-09-13 15:41:52 -03:00
KDSBrowne
8c4954cb5f
update poll opt delete btn | add removed poll opt alert SR
2021-09-13 00:11:45 +00:00
KDSBrowne
dc3c145b29
add SR alert for removed poll option
2021-09-13 00:03:03 +00:00
Ramon Souza
098826c70a
rename layout functions
2021-09-10 17:48:52 -03:00
Ramon Souza
981e707612
add selector to containers, remove old layoutContext + convert base component into function
2021-09-10 14:21:04 -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
fee3f49452
fix lgtm alerts
2021-08-27 10:47:58 -03:00
Ramon Souza
bed369d2d1
break lines in live result button
2021-08-18 17:46:04 -03:00
Ramon Souza
7dede494c7
move label out of switch component
2021-08-18 17:02:46 -03:00
Ramon Souza
015fd6e7a8
poll buttons rework for small panel sizes
2021-08-18 16:33:32 -03:00
Anton
ccba36f57d
fix polling test
2021-08-16 23:04:17 -03:00
Ramon Souza
adb70bde41
capitalize A-I polls
2021-08-16 14:25:16 -03:00
KDSBrowne
0ad6cbb2d0
add aria-descriptions to poll panel
2021-08-11 12:16:58 +00:00
Vitor Mateus De Almeida
145ca61d40
linting some files
2021-08-09 11:24:02 -03:00
Vitor Mateus De Almeida
1b18977eac
rename all NewLayout.. to Layout..
2021-08-05 08:03:24 -03:00
Anton Georgiev
37c6175f09
Merge pull request #12704 from jfsiebel/hide-poll-response-viewers
...
Filter anonymous poll data for presenter, moderators and viewers
2021-07-12 08:51:29 -04:00
Ramon Souza
268608a9ab
close poll panel if user is no longer the presenter
2021-07-07 17:15:07 -03:00
Anton Georgiev
b9cc633286
Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.3.5-into-develop
2021-07-06 19:36:19 +00:00
Joao Siebel
7e46f31bf8
Remove responses fields from minimongo when the poll is anonymous
2021-07-02 16:58:33 -03:00
Anton Georgiev
1b8fea89cd
Merge pull request #12607 from hiroshisuga/patch-35
...
Remove linefeed for polling option
2021-07-02 15:09:39 -04:00
germanocaumo
bd29d156b3
fix(poll): Respect maxCustom property in quick-polls
...
More than 5 answers are now of Custom type poll and answers passed directly.
Increase A-I slide options detection
2021-06-30 15:19:09 +00:00
germanocaumo
2c262483d2
fix(poll): Respect maxCustom property in quick-polls
...
More than 5 answers are now of Custom type poll and answers passed directly.
Increase A-I slide options detection
2021-06-18 14:02:09 +00:00
germanocaumo
1fb9870cf7
Apply suggestions from code review
...
Code style fixes and remove translations other than en to avoid conflicts with transifex.
Co-authored-by: Pedro Beschorner Marin <pedrobmarin@gmail.com>
2021-06-17 10:25:03 -03:00
hiroshisuga
08a87a7784
remove linefeed for polling option
2021-06-17 20:40:46 +09:00
germanocaumo
85f77442b7
fix(poll): chat result publish error
...
The poll is already removed with stopPoll that is called together with pollPublished
2021-06-16 22:31:09 +00:00
germanocaumo
349af23f0a
Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into anonymous-polls
2021-06-16 21:54:28 +00:00
Anton Georgiev
5ee5ed1970
Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-june16
2021-06-16 19:54:28 +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
Vitor Mateus De Almeida
ba400b2ebd
Merge remote-tracking branch 'upstream/develop' into layoutManagerNew
2021-06-09 11:03:34 -03:00
Vitor Mateus De Almeida
f6fc8225f6
Add container for presentation
2021-06-09 10:49:59 -03:00
germanocaumo
0be7c6c9f5
fix(poll): fix client crash with A-F as options and quick-poll type
2021-06-07 19:21:21 +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
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
