Commit Graph

28236 Commits

Author SHA1 Message Date
Simon Hirtreiter
723ba68549 Merge remote-tracking branch 'origin/multiple-choice-poll' into multiple-choice-poll 2021-02-04 18:55:26 +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
Michael Zinsmeister
6da73ac68a Locales for multiple response 2021-02-04 16:51:36 +01:00
Michael Zinsmeister
7a6c534fef backend mutiple choice - config files 2021-02-04 16:13:21 +01:00
Michael Zinsmeister
462f963d08 backend mutiple choice 2021-02-04 16:13:07 +01:00
Simon Hirtreiter
4c2d2d8244 update ui for multiple choice 2021-02-04 15:43:04 +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
2c693d8192
Merge pull request #11282 from maths22/requests-without-session
Restore allowRequestsWithoutSession to resources.xml
2021-02-01 15:03:29 -05:00
Jacob Burroughs
f4ecf4c7ed Restore allowRequestsWithoutSession to resources.xml
Otherwise that property is not read from the bigbluebutton.properties file.
It was removed in an overzealous deletion in
418fdb1a31
2021-02-01 09:43:50 -06:00
Anton Georgiev
e101d037f2
Merge pull request #11268 from mariogasparoni/develop
Correctly return MediaStream object when calling audio-manager's inputStream
2021-01-29 17:34:56 -05:00
Mario Jr
08732767e3 Removed duplicated audio filter option in Settings > Application 2021-01-29 19:23:38 -03:00
Mario Jr
b582b1ca78 Correctly return MediaStream object when calling audio-manager's inputStream
This was missed in recent audio/sip.js changes.
MediaStream is now returned from SIP.js
Related to #10733
2021-01-29 19:05:51 -03:00
Anton Georgiev
0caaf07833
Merge pull request #11267 from antobinary/merge-Jan30
Pulled HTML5 locales Jan 29, 2021; tested
2021-01-29 16:24:15 -05:00
Anton Georgiev
aae9ca055a Pulled HTML5 locales Jan 29, 2021; tested 2021-01-29 21:22:20 +00:00
Anton Georgiev
b2b442d86d
Merge pull request #11217 from werk21/9101_add_poll_abstention_for_branch_develop
9101: Survey: New profile yes/no/abstention for branch develop
2021-01-29 16:05:39 -05:00
Anton Georgiev
51abebefed
Merge branch 'develop' into 9101_add_poll_abstention_for_branch_develop 2021-01-29 16:04:02 -05:00
Anton Georgiev
3dca26e2d8
Merge pull request #11266 from antobinary/merge-Jan30
Merging 2.2.x-release into 'develop' on Jan 29, 2021
2021-01-29 16:03:03 -05: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
Anton Georgiev
42abdf176a
Merge pull request #11265 from jfsiebel/simplify-client-connections-structure
Remove old connection id on user leave
2021-01-29 15:35:26 -05:00
Joao Siebel
09f5931d65 Keep track of active connection id for users 2021-01-29 17:29:07 -03:00
Anton Georgiev
1564a7a9d9
Merge pull request #11264 from ramonlsouza/fix-typing-indicator-display
Fixes typing indicator display
2021-01-29 12:39:12 -05:00
Tainan Felipe
dd63051825 fix typing indicator display 2021-01-29 14:33:51 -03:00
Anton Georgiev
60cfeb6189
Merge pull request #11263 from ramonlsouza/fix-active-webcam-icon
Fixes active webcam icon
2021-01-29 12:28:39 -05:00
Anton Georgiev
d122639042
Merge pull request #11239 from jfsiebel/sync-with-active-connections
Synchronize users with active connections
2021-01-29 12:28:07 -05:00
Joao Siebel
68b2752e0d Add flag to enable sync 2021-01-29 14:27:13 -03:00
Anton Georgiev
03a5903512
Merge pull request #11262 from mariogasparoni/develop
Add setting for enabling/disabling microphone audio filters
2021-01-29 12:24:40 -05:00
Ramon Souza
6c1856c0a4 fix active webcam icon 2021-01-29 14:23:50 -03:00
Mario Jr
f2de2806eb Add setting for enabling/disabling microphone audio filters
As explained in #11143, disabling audio filters is desired in some scenarios.
This basically adds an option for user to disable default constraints.
When user doesn't change this value in Settings > Application, the default
value for each audio constraints is retrieved from settings.yml.
When user changes this value in Settings > Application, audio
filters (AGC, Noise Supression and Echo Cancellation) are all set to
true/false, according to the value selected in the Settings GUI.

To start it simple, we decided to not to add a different setting in the GUI for
each audio contraint. This may be added in the future, though (perhaps in a
dedicated Audio Settings tab)
This is related to #4873
2021-01-29 14:18:15 -03:00
Anton Georgiev
b2c702417c
Merge pull request #11216 from werk21/9101_add_poll_abstention
9101 add poll abstention
2021-01-27 11:57:15 -05:00
Anton Georgiev
aae4d1567d
Merge pull request #11232 from prlanzarin/u22-lv521012021
video-provider: fix inconsistent client state when a webcam being shared times out
2021-01-27 11:29:16 -05:00
Anton Georgiev
28eb93ebaa
Merge pull request #11244 from antobinary/bbb-11197
Update axios to 0.21.1
2021-01-27 11:24:50 -05:00
Anton Georgiev
e8a203f85a Bump up release to 2.2.32 2021-01-27 11:21:35 -05:00
Anton Georgiev
07b4142a27 update axios to resolve security vuln 2021-01-27 11:19:59 -05:00
Anton Georgiev
a30e1703fa
Merge pull request #11243 from jfsiebel/configurable-heapdump-threshold
Add heapdump threshold in settings
2021-01-27 09:21:39 -05:00
Joao Siebel
31552f6c78 Add heapdump threshold in settings 2021-01-27 11:04:49 -03:00
Anton Georgiev
12a6b73ba0
Merge pull request #11240 from antobinary/bbb-11197
Prevent open textarea blocking dropdown menus
2021-01-26 17:16:03 -05:00
KDSBrowne
47e2f12b74 prevent open textarea blocking dropdown menus 2021-01-26 17:13:18 -05:00
Anton Georgiev
991d978f77
Merge pull request #11230 from prlanzarin/u22-poodlepower25012021
audio: fix talking-indicator mute debounce
2021-01-26 16:55:10 -05:00
Anton Georgiev
e2f821d780
Merge pull request #11229 from prlanzarin/u22-revert10912
video-provider: Revert "Improve 16x9 Support"
2021-01-26 16:51:03 -05:00
Anton Georgiev
28fc33462d
Merge pull request #11228 from prlanzarin/u22-frameshift26012021
video-provider: make video-list-item actions dropdown keys unique
2021-01-26 16:50:01 -05:00
Anton Georgiev
5e365d138f
Merge pull request #11231 from prlanzarin/u22-drc25012021
audio: add a configurable throttle to action-bar`s mute toggle
2021-01-26 16:49:13 -05:00
Joao Siebel
8c7c21f936 Sync users in collection with server active connections 2021-01-26 16:22:32 -03:00
Anton Georgiev
5713fa54f3
Merge pull request #11236 from antobinary/filter-dummy-users
Only publish full users to client side, no dummy users
2021-01-26 12:45:36 -05:00
Anton Georgiev
2912281829
Merge pull request #11235 from mariogasparoni/v2.2.x-release
Fix wrong path in settings for audio constraints
2021-01-26 12:35:23 -05:00
Mario Jr
b753ef5d8d Fix wrong path in settings for audio constraints
Using now 'application' instead of old 'audio' path
2021-01-26 14:12:18 -03:00
Anton Georgiev
6c27e815fc Only publish full users to client side, no dummy users 2021-01-26 16:56:28 +00:00
prlanzarin
c57941dbdb video-provider: make video-list-item actions dropdown keys unique
When multiple actions were bolted in the dropdown (mirror, focus), keys were getting duplicated with cameraId. Make them unique based on the action`s name
2021-01-26 12:32:27 -03:00
prlanzarin
32e7ddeaf7 Revert "Improve 16x9 Support"
This reverts commit b8fc94c722.
2021-01-26 12:03:11 -03:00