Commit Graph

6289 Commits

Author SHA1 Message Date
Joao Siebel
1581c71efe Normalize custom parameters by removing extra space. 2020-09-08 11:29:05 -03:00
Joao Siebel
700c91729e Prevent non presenters to start/stop an external video 2020-09-04 13:49:01 -03:00
João Francisco Siebel
52654bc927
Update bigbluebutton-html5/imports/api/external-videos/server/methods/stopWatchingExternalVideo.js
Co-authored-by: Anton Georgiev <antobinary@users.noreply.github.com>
2020-09-03 17:02:27 -03:00
Joao Siebel
5f03f23e02 Add check when start/stop an external video to prevent edge case 2020-09-03 16:07:54 -03:00
KDSBrowne
03fb47842b localize text in saved names txt file 2020-08-29 16:39:29 +00:00
KDSBrowne
e4000110bb add lists sorted by first and last name to saved user names 2020-08-29 02:17:04 +00:00
Anton Georgiev
3003897bfe
Merge pull request #10336 from prlanzarin/upstream-2.2-vpeg-pagination
video-provider: add missing PropType, remove render socketOpen check
2020-08-27 09:17:04 -04:00
Anton Georgiev
c14d43f3ab
Merge pull request #10335 from prlanzarin/upstream-2.2-ssisvb
screenshare: improve screenshare service findOne calls
2020-08-27 09:14:45 -04:00
Anton Georgiev
e5740b18ce
Merge pull request #10334 from pedrobmarin/v2.2.x-mute-button-status
Include voice user's upsert to changes observer
2020-08-27 09:09:33 -04:00
prlanzarin
395de41f60 video-provider: add missing proptype
Also trim down prop assignment in render
2020-08-27 02:20:09 +00:00
prlanzarin
191654814a video-provider: remove socket open state condition for rendering video-list
That check doesnt make sense anymore. Removing it makes the video list load faster and webcam sharing seem more responsive
2020-08-27 02:19:55 +00:00
prlanzarin
e5c1eddf88 [screenshare]: improve screenshare service findOne calls 2020-08-26 21:41:11 +00:00
Pedro Beschorner Marin
0971edfcb6 Include voice user's upsert to changes observer
We noticed that the mute action button wasn't being consistent when
using muteOnStart as meeting configuration.

Included the addition of the voice user object to the collection as
an event to also be observed.
2020-08-26 18:37:04 -03:00
Anton Georgiev
4476df6f09
Merge pull request #10318 from prlanzarin/upstream-2.2-vpeg-pagination
video-provider: prioritise presenter in pagination ordering, restore pre-.22 full mesh ordering
2020-08-24 17:14:43 -04:00
Anton Georgiev
b8959be312
Merge pull request #10304 from pedrobmarin/individual-video-record-control
Add individual video record control
2020-08-24 16:58:16 -04:00
prlanzarin
f3674335a4 video-provider: prioritise presenter in pagination ordering
Also restore the old full mesh, pre-.22 ordering where outbound streams were put first
2020-08-24 19:55:29 +00:00
Anton Georgiev
89319787f8
Merge pull request #10317 from prlanzarin/upstream-2.2-vpeg-pagination
video-provider: fix dynamic profile accounting when using pagination
2020-08-24 15:14:00 -04:00
prlanzarin
e7323ee6a5 video-provider: fix dynamic profile accounting when using pagination 2020-08-24 18:30:24 +00:00
KDSBrowne
6f377c3d77 make external video MATCH_URL even more generic 2020-08-24 17:59:46 +00:00
Anton Georgiev
59ab8e215d
Merge pull request #10315 from prlanzarin/upstream-2.2-vpeg-pagination
video-provider: fix pagination edge case
2020-08-24 10:42:07 -04:00
prlanzarin
2e6627b820 video-provider: fix pagination edge case where pages would be calculated as NaN 2020-08-24 14:35:28 +00:00
Pedro Beschorner Marin
8b54c01898 Add hack to avoid recording viewers video stream
If, at the time the video is shared, the user has a viewer role and
meta_hack-record-viewer-video is false this user won't have this video
stream recorded.
2020-08-22 21:00:31 -03:00
Pedro Beschorner Marin
95bc7cd59e Add individual video record control
This adds bbb_record_video userdata that, when is set to false, signals
bbb-webrtc-sfu to avoid generating the stream recording assets for a
particular user.

By default, bbb_record_video is true.
2020-08-21 19:10:25 -03:00
Anton Georgiev
4fb301c48b
Merge pull request #10293 from prlanzarin/upstream-2.2-vpeg-pagination
video-provider: first tackle at video pagination
2020-08-20 15:24:57 -04:00
prlanzarin
0b29b5a812 video-provider: enrich pagination enabled checks 2020-08-20 17:26:32 +00:00
prlanzarin
a98c476239 video-provider: remove page change lock in favor of a debounced approach 2020-08-20 15:43:02 +00:00
Anton Georgiev
077f0c985a
Merge pull request #10295 from prlanzarin/upstream-2.2-fix-mirroring
video-provider: fix mirrorOwnWebcam behaviour (regression from #10208)
2020-08-20 08:39:34 -04:00
Anton Georgiev
64cc59fd4c
Merge pull request #10296 from KDSBrowne/2.2-add-slide-text-SR
Add presentation slide text for screen readers
2020-08-20 08:37:51 -04:00
KDSBrowne
916b7d7f31 add slide text for screeen reader 2020-08-20 01:48:10 +00:00
prlanzarin
5f72cecf4f video-provider: fix mirrorOwnWebcam behaviour (regression from #10208) 2020-08-20 01:12:56 +00:00
Pedro Beschorner Marin
69c408e16a Disable notes and captions footer
Something related on not being able to provide links
2020-08-19 20:27:41 -03:00
prlanzarin
bc4ce58251 video-provider: make pagination circular 2020-08-19 22:27:47 +00:00
Anton Georgiev
3099b8fb45
Merge pull request #10265 from pedrobmarin/notes-cc-header-style
Fix shared notes and closed captions header button style
2020-08-19 15:58:51 -04:00
Anton Georgiev
fdc14ba42b
Merge pull request #10289 from pedrobmarin/data-savings-presentation-area
Check video data savings to set presentation max-height
2020-08-19 15:39:37 -04:00
Anton Georgiev
4d688fee20
Merge pull request #10280 from KDSBrowne/2.2-localize-cam-quality
Localize drop-down values for webcam quality
2020-08-19 15:33:11 -04:00
Anton Georgiev
d95d8a66f0
Merge pull request #10279 from KDSBrowne/2.2-remove-br-mod-options
Remove mute and clear public chat options from breakouts
2020-08-19 15:31:43 -04:00
Anton Georgiev
31645b26ef
Merge pull request #10278 from KDSBrowne/2.2-issue-10204
Fix text area's being created smaller than a single character
2020-08-19 15:22:22 -04:00
prlanzarin
0e02b6a6f8 video-provider: remove nonsensical play abort warning log 2020-08-19 13:56:53 +00:00
prlanzarin
2d436977cb video-provider: add pagination page change timer to prevent spamming 2020-08-19 13:56:22 +00:00
Pedro Beschorner Marin
7ab3d9a386 Check video data savings to set presentation max-height 2020-08-18 16:41:18 -03:00
prlanzarin
28e826118a video-provider: first version of video pagination 2020-08-18 17:00:47 +00:00
KDSBrowne
fbeaf87dbd localize the dropdown values for webcam quality 2020-08-17 16:19:45 +00:00
KDSBrowne
9f8661bc15 remove mute / unmute / clear chat options for breakoutrooms 2020-08-14 17:13:51 +00:00
Pedro Beschorner Marin
26fcb97dd9 Fix shared notes and closed captions header button style
Also adds a little more visibility and well-deserved credit to Etherpad's project
2020-08-14 11:32:52 -03:00
KDSBrowne
c6bb65b24b prevent user creating textarea too small for text 2020-08-11 14:54:29 +00:00
KDSBrowne
76a98459c8 backport #8484 from 2.3 to 2.2 2020-08-11 14:51:59 +00:00
prlanzarin
c524abf05b video-provider: normalize hidden cameraProfiles constraints
Also add some inlined docs to settings.yml
2020-08-11 14:51:50 +00:00
Anton Georgiev
9aefa76ded allow more tags in welcome message/ mod only message 2020-08-10 16:59:09 -04:00
Anton Georgiev
396233fe0d Improve log for parsed passed parameter error 2020-08-10 15:54:58 -04:00
Anton Georgiev
c7b4c570af remove muteAll and muteAllExceptPresenter from breakouts 2020-08-10 12:50:32 -04:00
Anton Georgiev
247861f549
Merge pull request #10213 from prlanzarin/upstream-2.2-vpeg-dynprof
video-provider: dynamic video profiles (aka automatic bitrate/frame rate throttling)
2020-08-07 13:20:56 -04:00
Anton Georgiev
08a83755e4
Merge pull request #10212 from prlanzarin/upstream-2.2-vpeg-ui
video-provider: UI improvements
2020-08-07 13:20:07 -04:00
Anton Georgiev
9c9b8c9772
Merge pull request #10208 from prlanzarin/upstream-2.2-vpeg-base-extra
Backport PRs #8374 and its follow-ups #8888 and #8758 into 2.2
2020-08-06 16:57:41 -04:00
KDSBrowne
84af0bc0cc improve panoptoMATCH_URL regex (more generic) 2020-08-05 17:08:57 +00:00
CristianSilvaGrosseli
378a355316 fix displaced audio icon. 2020-08-05 17:05:47 +00:00
CristianSilvaGrosseli
da2e947cf4 added ellipsis property to video user name. 2020-08-05 17:05:23 +00:00
prlanzarin
d18fa5d758 video-provider: fix safari overflow issue and properly fill height with placeholder
kudos @pedrobmarin
2020-08-05 17:02:59 +00:00
prlanzarin
67194618b8 video-provider: revert videoListItem max-height change
I did it to force the placeholder to fill the grid, but it turns out it botches Safari and I dont know how to fix it yet
2020-08-05 17:02:54 +00:00
prlanzarin
147e7b2105 video-provider: further cleanup to stylesheet 2020-08-05 17:02:23 +00:00
prlanzarin
dc194eafdf screenshare: move loading spinner css to media and restore it 2020-08-05 17:02:08 +00:00
prlanzarin
39e9c2f6e0 fullscreen-button: remove border-radius 2020-08-05 17:01:56 +00:00
prlanzarin
dd32a669dc video-provider: revert formatting changes from commit 0ca68b4 2020-08-05 17:01:45 +00:00
prlanzarin
03a51611a2 video-provider: UI/style updates
- No more border radius in video containers, fullscreen buttons or user info span

Reduced the spacing between cameras to 1px

Replaced the loading spinners with a black background and the user name at the center

- Changed the color of the talking indicator to be the primary color with 0.7 opacity

Make the user name in the video container have opacity 1

Fix: make the webcam containers be 4:3 even while loading
2020-08-05 17:01:15 +00:00
prlanzarin
1d52b158f8 video-provider: fix safari resolution change on applyConstraints, only reapply bitrate when needed 2020-08-05 16:56:18 +00:00
prlanzarin
642de5076a video-provider: first, simplified version of dynamic camera profile control 2020-08-05 16:55:41 +00:00
prlanzarin
44b1734b4e video-preview: add the option to hide camera profiles from UI 2020-08-05 16:37:30 +00:00
Pedro Beschorner Marin
7b3505acff Enumerating devices after video preview gUM 2020-08-05 15:06:44 +00:00
Pedro Beschorner Marin
40908a51a8 Postponing get from user settings 2020-08-05 14:56:20 +00:00
prlanzarin
fab6d96769 video-provider: reimplement PR #9407
Some weird merged regressed #9407 when merging 2.2 in 2.3, and backporting the VP from 2.3 to 2.2 reintroduced the issue, so I reimplemented it
2020-08-05 14:35:08 +00:00
Pedro Beschorner Marin
b74bd0283e Fix webcamsOnlyForModerator 2020-08-05 14:32:51 +00:00
Pedro Beschorner Marin
4d5d0ad8b4 Multiple webcams stop all button 2020-08-05 14:23:34 +00:00
prlanzarin
dac3259c48 Merge remote-tracking branch 'pedrobmarin/bbb-multiple-webcams' into upstream-2.2-vpeg-base 2020-08-05 14:20:58 +00:00
Anton Georgiev
6fe9990c1e
Merge pull request #10172 from KDSBrowne/2.2-fix-sr-poll-access
Add aria-label to whiteboard poll result
2020-07-31 15:20:19 -04:00
KDSBrowne
7f7e24bfb4 prevent negative values being supplied to svg height / width 2020-07-31 14:19:28 +00:00
KDSBrowne
f409e912b1 add aria-label to whiteboard poll result 2020-07-31 13:20:48 +00:00
Anton Georgiev
0d6faa0b57 only allow for https uri in welcome and modOnly messages 2020-07-29 16:08:47 -04:00
Anton Georgiev
2c32608cd5 allow for img tag in welcome and modOnly messages 2020-07-29 15:09:15 -04:00
Anton Georgiev
b9902eceac
Merge pull request #10148 from pedrobmarin/full-audio-socket-check
Add a minimum socket validation to full-audio connection
2020-07-29 13:13:30 -04:00
Pedro Beschorner Marin
19e301e28e Add a minimum socket validation to full-audio connection 2020-07-29 13:10:17 -03:00
Anton Georgiev
49cec4ca16
Merge pull request #10146 from antobinary/sanitize
Sanitized modOnlyMessage prior to using it
2020-07-29 11:58:13 -04:00
Anton Georgiev
45c2368a3c Pulled HTML5 locales on July 29, 2020 2020-07-29 11:54:21 -04:00
Anton Georgiev
1ea72ccb95 sanitize modOnlyMessage in html5 client 2020-07-29 11:31:00 -04:00
Anton Georgiev
4456a4db1f move sanitazing of welcome message to backend 2020-07-27 16:33:10 -04:00
Vitor Mateus De Almeida
be3bfd620a Merge remote-tracking branch 'upstream/v2.2.x-release' into sanitize-data-v2.2 2020-07-27 16:13:20 -03:00
Vitor Mateus De Almeida
3ef0771d58 Add tag br in whitelist 2020-07-27 16:12:31 -03:00
Anton Georgiev
321942e2ed
Merge pull request #10089 from vitormateusalmeida/sanitize-data-v2.2
Sanitize data in addUser
2020-07-23 10:23:35 -04:00
KDSBrowne
f45af628d6 fix screen share cropping on chrome 2020-07-19 21:53:59 +00:00
Vitor Mateus De Almeida
da570ca002 Sanitize data in message 2020-07-17 15:36:30 -03:00
Vitor Mateus De Almeida
6cb28a6574 Sanitize data in addUser 2020-07-17 12:08:02 -03:00
Joao Siebel
ee3d6a0a1d Clear private messages on meeting end 2020-07-14 16:51:06 -03:00
Anton Georgiev
1ea076a940
Merge pull request #10024 from antobinary/breakouts-url
Ensure getURL value for breakout before redirecting
2020-07-10 13:59:23 -04:00
Anton Georgiev
c763041285 Adjust check for User.loggedOut to prevent errors 2020-07-10 13:45:37 -04:00
Anton Georgiev
9f5158a525 Merge branch 'custom-parameters-breakout-rooms' of github.com:jfsiebel/bigbluebutton into locales-2020-07-10 2020-07-10 11:21:53 -04:00
Anton Georgiev
bc55bc0d41 ensure getURL value for breakout before redirecting 2020-07-09 16:53:42 -04:00
Anton Georgiev
fad56de143
Merge pull request #9966 from lfzawacki/v2.2.x-release
Implement a simple Panopto external video player
2020-07-09 16:26:25 -04:00
prlanzarin
1dbafffa26 audio: make listen only call timeout configurable 2020-07-09 18:02:18 +00:00
prlanzarin
0f8b27d2d8 video-provider: make camera timeouts configurable
Also add missing settings.yml val for wsConnectionTimeout
2020-07-09 17:53:24 +00:00
prlanzarin
72a67bdd63 video-provider: make reconn websocket connectionTimeout configurable
Keep the default value (current) in settings.yml
2020-07-09 17:50:04 +00:00
Lucas Zawacki
65892677ee Make file video player work on every browser 2020-06-30 17:41:44 -03:00
Lucas Zawacki
4158372ac7 Use panoto mp4 url to implement a version of external-video 2020-06-30 17:41:42 -03:00
Anton Georgiev
0a399af81f add clientURL to logs from client 2020-06-30 15:18:01 -04:00
Anton Georgiev
e22856d29e prevent triggers of unmute others caused by incorrect state 2020-06-26 18:51:01 +00:00
Anton Georgiev
ff1357cbbd
Revert "Improve audio reconnection for muted users for 2.2" 2020-06-22 16:28:22 -04:00
Anton Georgiev
d40f56c657
Merge pull request #9896 from KDSBrowne/unread-note-placement
Fix shared note unread indicator placement
2020-06-22 10:18:38 -04:00
KDSBrowne
c47ff6026d fix position of shared note unread indicator 2020-06-22 13:48:52 +00:00
Anton Georgiev
aed4d648a9
Merge pull request #9780 from Tainan404/fix-audio-reconnect-2.2
Improve audio reconnection for muted users for 2.2
2020-06-19 16:58:55 -04:00
Anton Georgiev
16189780c8
Update bigbluebutton-html5/imports/ui/services/audio-manager/index.js 2020-06-19 16:58:41 -04:00
Anton Georgiev
8a5f201c98
Update bigbluebutton-html5/imports/api/voice-users/server/methods/muteToggle.js 2020-06-19 16:58:33 -04:00
Anton Georgiev
7a04ac0355
Update bigbluebutton-html5/imports/api/voice-users/server/methods/muteToggle.js 2020-06-19 16:58:24 -04:00
Anton Georgiev
0ac1773e3a
Merge pull request #9888 from Tainan404/listener-for-voice-user-22
Add a listener to voice user ejecting user from audio on socket disconnection
2020-06-19 16:54:22 -04:00
Anton Georgiev
a3f01721fc
Update bigbluebutton-html5/imports/api/voice-users/server/publishers.js 2020-06-19 16:53:59 -04:00
Anton Georgiev
e7d3487b5d
Merge pull request #9878 from lfzawacki/ending-time-alerts
Make meeting/breakout ending time alerts configurable
2020-06-19 16:25:50 -04:00
Tainan Felipe
7ddaac38c1 Add implici true for wasMuted 2020-06-19 17:20:36 -03:00
Tainan Felipe
9fa1986611 Add implicit toggle for toggle voice call 2020-06-19 17:07:11 -03:00
Tainan Felipe
b504101827 Add a listener to voice user ejecting user from audion on socket disconnection 2020-06-19 16:40:50 -03:00
Anton Georgiev
6eb7d55163
Merge pull request #9828 from SRCF/patch1
Enable mirroring for video streams
2020-06-19 13:56:45 -04:00
Anton Georgiev
75cd8c2ea3
Merge pull request #9741 from jfsiebel/prevent-680-error-screen
Show correct screen when user leaves meeting
2020-06-19 13:30:17 -04:00
Anton Georgiev
789a7cb581
Merge pull request #9754 from KDSBrowne/issue-9451
Fix poll annotation error with large presentations
2020-06-19 13:25:36 -04:00
Anton Georgiev
4d23da4a57
Merge pull request #9755 from KDSBrowne/issue-9730
Close whiteboard toolbar sub menu on mousedown
2020-06-19 13:22:12 -04:00
Joao Siebel
e227ecca83 Merge remote-tracking branch 'upstream/v2.2.x-release' into prevent-680-error-screen 2020-06-19 14:06:49 -03:00
KDSBrowne
6cf519bfb4 add touch start event handler / update handleMouseDown 2020-06-19 16:37:48 +00:00
Anton Georgiev
3e774a75c7
Merge pull request #9771 from KDSBrowne/issue-9766
Fix poll vote not incrementing when - is used as a custom option
2020-06-19 11:09:47 -04:00
Anton Georgiev
566d95d17c
Merge pull request #9756 from KDSBrowne/issue-9731
Add debounce to talking indicator mute function
2020-06-19 10:59:07 -04:00
Anton Georgiev
cd96a2f484
Merge pull request #9753 from KDSBrowne/issue-9410
Handle userData autoSwap and hidePresentation params
2020-06-19 10:58:28 -04:00
Anton Georgiev
b68c79b8ea
Merge pull request #9885 from jfsiebel/ban-user-error-screen
Remove Log In back button in error screen
2020-06-19 09:29:28 -04:00
Joao Siebel
c8820da6fe Change text order 2020-06-19 10:01:30 -03:00
Joao Siebel
a6f3ea80be Clean code 2020-06-19 09:51:14 -03:00
Joao Siebel
38bad0a9d8 Remove button in ErrorScreen component 2020-06-19 09:49:07 -03:00
Anton Georgiev
9edf4b6a0c
Merge pull request #9757 from KDSBrowne/issue-9661
Prevent drag and drop of files closing session
2020-06-18 16:49:05 -04:00
Lucas Zawacki
3f16d894c3 Configurable ending time and alert values 2020-06-18 15:11:33 -03:00
Lucas Zawacki
a586c7db55 Configuration for remaining time 2020-06-18 15:11:26 -03:00
amassaro
888fe0b040 centralize base prop cleaning / deletion 2020-06-18 08:47:52 -07:00
Joao Siebel
6ac739732c Remove button in error screen when user was banned 2020-06-18 12:12:22 -03:00
Anton Georgiev
0cb7759cb2
Merge pull request #9824 from jfsiebel/fix-banned-users-join-try
Prevent banned user from trying to validateAuthToken multiple times
2020-06-17 17:09:40 -04:00
KDSBrowne
4386248c9b remove chat option for dial in users 2020-06-17 12:37:09 +00:00
Anton Georgiev
778695b4d9
Merge pull request #9758 from jfsiebel/clear-video-streams
Clear video streams collection
2020-06-16 16:20:56 -04:00
mw781
2da9028c0b Extract constant for convenience 2020-06-15 21:51:46 +01:00
mw781
f4dc8d9d69 Fix critical issue with video-preview arguments
After the code to mirror the video-preview component was added
I noticed that I improperly used the userId property of an undefined
argument as the video-preview does not have a user as a prop. This
commit decouples the logic to verify if the webcam should be mirrored
and whether the webcam belongs to that user. In the latter, we verify
if the user parameter exists and use it in a conditional, otherwise
we simply return true (applies with the video preview component),
where there is only one video stream.
2020-06-15 21:49:00 +01:00
mw781
bf68d2c76f Refactor code and implement mirroring for video-preview 2020-06-14 20:13:47 +01:00
mw781
fceac6dbc5 Import user settings 2020-06-12 23:49:07 +01:00
mw781
17350a57fe Implement own video mirroring 2020-06-12 23:39:41 +01:00
Anton Georgiev
87ea96b386
Merge pull request #9827 from antobinary/audio-logs
Added callerIdName in audio logs where possible
2020-06-12 17:15:20 -04:00
Anton Georgiev
ddb54273c1 Added callerIdName in audio logs where possible 2020-06-12 21:13:49 +00:00
Anton Georgiev
d5bcedd618
Merge pull request #9744 from jfsiebel/custom-parameters-guest-user
Fix custom parameters for guest users
2020-06-12 16:44:43 -04:00
Anton Georgiev
5aa1b2d1c5
Merge pull request #9825 from lfzawacki/v2.2.x-release
Fix twitch external video sharing
2020-06-12 16:39:48 -04:00
Joao Siebel
e9666e4f21 Merge remote-tracking branch 'upstream/v2.2.x-release' into prevent-680-error-screen 2020-06-12 17:28:38 -03:00
Joao Siebel
492acd6b5c Add a warn when a banned user tries to join the meeting 2020-06-12 16:51:22 -03:00
Lucas Zawacki
0e9baf8ac7 fix twitch option name 2020-06-12 15:06:58 -03:00
Lucas Zawacki
abf4f45602 Update react-player and fix twitch sharing 2020-06-12 15:01:15 -03:00
Joao Siebel
45f99fed8b Prevent banned user from trying to validate auth token multiple times. close #9798 2020-06-12 13:24:11 -03:00