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

5063 Commits

Author SHA1 Message Date
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
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
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
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
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
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
9fa1986611 Add implicit toggle for toggle voice call 2020-06-19 17:07:11 -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
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
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
KDSBrowne
ace61eaf3d restore presentation when screen share ends 2020-06-11 13:16:22 +00:00
Anton Georgiev
6da65c3c84
Merge pull request #9802 from KDSBrowne/2.2-typeError-fix 
fix TypeError: event.path is undefined
 2020-06-10 09:28:57 -04:00
Lucas Zawacki
a5bd5d8086 Prevent playbackrate update if value hasn't changed 2020-06-09 16:55:25 -03:00
Lucas Zawacki
9b7c734f86 Prevent problems playing some vimeo videos by adding default options 2020-06-09 16:55:23 -03:00
Joao Siebel
6c6825d101 Subscribe to collections when user role change. close #9733 2020-06-05 10:32:05 -03:00
Tainan Felipe
e540d6e46d set user as muted in audio reconnection 2020-06-05 09:41:48 -03:00
KDSBrowne
d19c941bf3 remove - as default response placeholder in poll results 2020-06-04 12:18:49 +00:00
KDSBrowne
e23b5c847d close whiteboard toolbar submenu on mousedown 2020-06-03 18:32:39 +00:00
KDSBrowne
a4642569d8 prevent drag and drop of files closing session 2020-06-03 15:39:02 +00:00
Joao Siebel
9690597803 Fix custom parameters for guest users. close #9737 2020-06-02 17:44:17 -03:00
Joao Siebel
faa0b35032 Show correct screen when user leave meeting. close #9710 2020-06-02 16:47:26 -03:00
KDSBrowne
89df783ee0 add debounce to talking indicator mute 2020-06-01 21:37:14 +00:00
Lucas Zawacki
71819feaab Call onmount for custom arc-player 2020-06-01 15:36:16 -03:00
KDSBrowne
dabc2e8213 fix poll annotation error with large presentations 2020-06-01 16:57:46 +00:00
KDSBrowne
23e306b9e6 handle userData autoSwap and hidePresentation params 2020-06-01 13:29:43 +00:00
Anton Georgiev
f510fdc484
Merge pull request #9517 from KDSBrowne/2.2-restore-presentation-on-update 
Restore minimized presentation for viewer on (slide or zoom change / pub…
 2020-05-29 13:20:31 -04:00
Anton Georgiev
a5171da678
Merge pull request #9516 from KDSBrowne/issue-9410 
Hide default content when hidePresentation and autoSwapLayout enabled
 2020-05-29 12:56:14 -04:00
Anton Georgiev
fcc43f8bd6
Merge pull request #9715 from KDSBrowne/2.2-fix-captions-with-sr 
Make screen reader announce captions as they are appear
 2020-05-29 10:33:37 -04:00
Anton Georgiev
247ba9af40
Merge pull request #8964 from KDSBrowne/issue-7898 
Fix chat dropdown not filling screen (mobile)
 2020-05-28 15:55:01 -04:00
KDSBrowne
4020a6da9f make screen reader announce captions as they are typed 2020-05-27 17:01:21 +00:00
KDSBrowne
4e68ea07fd fix non userData shortcuts not functioning 2020-05-26 12:12:57 +00:00
Anton Georgiev
54fe878a05
Merge pull request #9643 from jfsiebel/save-settings-on-start 
Prevent userChangedLocalSettings call failing at start
 2020-05-22 14:52:50 -04:00
Joao Siebel
7d9f4c70ad Prevent userChangedLocalSettings call failing at start 2020-05-22 13:54:00 -03:00
KDSBrowne
03d0931c1c add style / message updates 2020-05-22 16:39:54 +00:00
Anton Georgiev
fdcccbbc29
Merge pull request #9640 from antobinary/ban-eject-user 
Distinguish between eject and ban for Remove user
 2020-05-22 11:37:11 -04:00
Anton Georgiev
ca9ae8d861 cleanup 2020-05-22 10:55:11 -04:00
KDSBrowne
afe995393e remove className 2020-05-22 10:47:22 -04:00
KDSBrowne
274335cc9d add checkbox toremove user modal 2020-05-22 10:47:03 -04:00
Anton Georgiev
e7917994d5 add banUser field in EjectUserFromMeetingCmdMsgBody 2020-05-22 10:45:28 -04:00
Anton Georgiev
aeeac803c7
Merge pull request #9620 from antobinary/simplify-publish 
Simplify the code used for promote-demote subscriptions
 2020-05-21 17:14:16 -04:00
Anton Georgiev
c290c9ee60 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into ban-eject-user 2020-05-21 16:54:31 -04:00
Anton Georgiev
1874cf8392 Add visuals for banning vs ejecting user 2020-05-21 16:40:08 -04:00
Anton Georgiev
b6524e66c7
Fix typo closing parenthesis 2020-05-21 15:11:11 -04:00
Anton Georgiev
e08ee31338
Merge pull request #9629 from KDSBrowne/issue-9569 
Update shared note item style
 2020-05-21 15:06:45 -04:00
Anton Georgiev
66f11468ac
Merge pull request #9631 from KDSBrowne/issue-9592 
Fix userData-shortcuts causing client crash
 2020-05-21 15:01:49 -04:00
Anton Georgiev
8609418cda
Merge pull request #9630 from KDSBrowne/issue-9543 
Change prompt message when screen share not supported
 2020-05-21 14:58:07 -04:00
Anton Georgiev
be81b20ff1
Merge pull request #9632 from antobinary/lock-breakouts 
Do not display "Lock viewers" option in breakouts
 2020-05-21 14:57:21 -04:00
Anton Georgiev
33156f8bc5 Do not display "Lock viewers" option in breakouts 2020-05-21 14:55:32 -04:00
KDSBrowne
51c3543826 fix shortcuts not working when helper is passed an array 2020-05-21 18:43:34 +00:00
Anton Georgiev
ead986e3e2
Merge pull request #9542 from prlanzarin/upstream-2.2-safari-ss 
Screenshare: add support on Safari 13+ and make constraints configurable
 2020-05-21 14:38:32 -04:00
Anton Georgiev
2d16e020d8
Merge pull request #9593 from lfzawacki/2.2-external-video 
Attempt to fix external video syncing
 2020-05-21 14:34:52 -04:00
KDSBrowne
8fc32bc7dc update message in media container 2020-05-21 18:26:47 +00:00
Anton Georgiev
92d7975978
Merge pull request #9619 from antobinary/modOnlyMessage 
Only provide modOnlyMessage to moderators
 2020-05-21 13:55:09 -04:00
prlanzarin
2cba85e866 html5: refactor STUN/TURN fetch, add fallback STUN, fix deadlock in audio join 
Refactored STUN/TURN fetch to be done only once, when successful, per session and cache it in mem to avoid too many reqs. Current way is a bit dumb, this should increase reliability a bit more. The caching is configurable so folks who want to use very short lived TURN credentials can disable it

Add a fallback STUN config option to be used when the default STUN/TURN fetch fails

Clean the safari/no candidate generation pre flight check from 3rd party STUNs

Fix deadlock in audio join when STUN/TURN fetch failed
 2020-05-21 04:35:17 +00:00
Anton Georgiev
5238d81193 Simplify the code used for promote-demote subscriptions 2020-05-20 17:07:36 -04:00
Anton Georgiev
201fa2902e Only provide modOnlyMessage to moderators. Promoted mod requires refresh to see it 2020-05-20 15:56:44 -04:00
KDSBrowne
13cf0799a1 fix shortcuts passed as userData not activating 2020-05-20 13:47:04 +00:00
Pedro Beschorner Marin
73085ee88c Avoid guest promotion 2020-05-20 09:34:53 -03:00
KDSBrowne
2637685c1c update shared note item style 2020-05-19 13:58:00 +00:00
Lucas Zawacki
b9c75b4872 Remove timestamp correction logic 2020-05-18 13:16:03 -03:00
Lucas Zawacki
aa8326995c Work with video time based in seconds (integers) 2020-05-18 12:11:12 -03:00
KDSBrowne
f327f31e71 update not supported string to be browser agnostic (screen share) 2020-05-15 13:10:52 +00:00
KDSBrowne
4d8df0f91e restore presentation area when presentation changes 2020-05-14 21:06:55 +00:00
Paulo Lanzarin
7541395781
screenshare: fix safari availability check 2020-05-14 15:23:07 -03:00
prlanzarin
e875408f8d screenshare: add support on Safari 12.1+ and make constraints configurable 
This adds support for screensharing on Safari 12.1+ or whichever has getDisplayMedia enabled

To be conservative and backwards compatible, I`ve maintained the current gUM-based code available as a fallback for those still using older versions of FF or Chrome

Made screenshare constraints configurable. The constraints config will be piped directly to gDM, so it`s just a regular gDM constraint dictionary
 2020-05-14 16:54:54 +00:00
Anton Georgiev
a60407c665
Merge pull request #9301 from KDSBrowne/2.2-update-userlist-icon 
Adds arrow to toggle user list icon
 2020-05-14 10:48:43 -04:00
KDSBrowne
75270e20f8 fix TypeError: event.path is undefined 2020-05-13 12:53:55 +00:00
Anton Georgiev
4e636a2396
Merge pull request #9518 from KDSBrowne/issue-9511 
Change shared notes lock behavior
 2020-05-12 17:55:48 -04:00
KDSBrowne
43a9f04edf localise string 2020-05-12 21:34:07 +00:00
KDSBrowne
26143e5889 prevent user item unlock affecting shared notes 2020-05-12 21:21:56 +00:00
KDSBrowne
4c23e060bf add username to remove confirmation title / update modal description 2020-05-12 21:04:07 +00:00
KDSBrowne
c28b0108ea prevent user item displaying as locked for shared notes lock 2020-05-12 19:43:10 +00:00
KDSBrowne
5f4676ec63 show lock by moderator label on shared notes 2020-05-12 19:07:01 +00:00
KDSBrowne
321d2cbd37 hide default content conponent if hidePresentation and autoSwapLayout 2020-05-12 14:42:34 +00:00
KDSBrowne
f5d004c322 restore minimized presentation for viewer (slide or zoom change / published poll / added annotation) 2020-05-12 12:58:14 +00:00
Anton Georgiev
4b03c707a2
Merge pull request #9407 from KDSBrowne/issue-9297 
Fix 'See other viewers in the Users list' lock enforcing lock on 'See other viewers webcams'
 2020-05-11 15:06:38 -04:00
Anton Georgiev
21375864fe
Merge pull request #9477 from KDSBrowne/issue-9302 
Localize default poll options before calculating annotation required space
 2020-05-11 14:48:22 -04:00
Anton Georgiev
29f5154fcc
Merge pull request #9481 from KDSBrowne/issue-9450 
Close video preview modal when "share webcam" lock activated
 2020-05-11 14:38:20 -04:00
Anton Georgiev
ee3175cf86
Merge pull request #9408 from KDSBrowne/2.2-fix-selected-user 
Set correct state in user list for selected user onClick
 2020-05-11 12:55:29 -04:00
Anton Georgiev
97acff2433
Merge pull request #9475 from KDSBrowne/remove-user-confirmation 
Adds remove user confirmation
 2020-05-11 12:17:12 -04:00
Farzad Akbarinezhad
dd16e636ed customSvgIcon css class bug fixed for rtl layouts 
in RTL layout, selecting colors and font thickness parts in whiteboard, will not appear correctly when they expand; one item will be thrown out of the container (overflow).
the following images demonstrate the problems.
adding some additional style to customSvgIcon class in css will fix the bug.

http://up.maralhost.com/do.php?img=359
http://up.maralhost.com/do.php?img=364
 2020-05-11 12:03:17 -04:00
KDSBrowne
eaccf8364c add outline to poll annotation text 2020-05-11 12:56:53 +00:00
KDSBrowne
2be89479ba close video preview modal if lock setting active 2020-05-09 17:19:41 +00:00
KDSBrowne
41e33d9cda localise default poll options before calculating required annotation space 2020-05-08 18:17:50 +00:00
KDSBrowne
2ca54d69f4 add remove user confirmation 2020-05-07 14:32:15 +00:00
KDSBrowne
741455aeba remove hideUserList() from video-provider service 2020-05-06 15:14:07 +00:00
Joao Siebel
6f9c8ee8ee Filter by authed users and add projection to the query 2020-05-05 11:19:52 -03:00
Joao Siebel
3b8d10bd8c Fix race condition in addUserSettings 2020-05-04 22:16:52 -03:00
KDSBrowne
f9fa2f36dd set correct state for selected user on click 2020-05-04 13:40:13 +00:00
KDSBrowne
e82e0f5be9 fix see views in user list lock affecting webcams 2020-05-02 16:50:40 +00:00
Fred Dixon
f4b7287960
Merge pull request #9365 from KDSBrowne/2.2-prevent-dup-user-styles 
Prevent multiple users displaying as selected in user list
 2020-04-30 19:49:24 -04:00
KDSBrowne
dffe1b1747 prevent multiple users displaying as selected in userlist 2020-04-30 23:26:17 +00:00
Anton Georgiev
0ee1d7a4fe
Merge pull request #9363 from antobinary/breakouts-no-private-chat 
Disable private chat initiation in breakouts
 2020-04-30 17:54:59 -04:00
Anton Georgiev
722ffa5d07 disable private chat initiation in breakouts 2020-04-30 17:50:34 -04:00
KDSBrowne
6915a028e3 use extractCredentials to get meeting id 2020-04-30 13:46:30 +00:00
KDSBrowne
957e5e3d30 fix captions from dictation not working 2020-04-30 13:15:21 +00:00
Anton Georgiev
117d172b0d
Merge pull request #9343 from KDSBrowne/2.2-update-hideOverlay-css 
Fix media overlay blocking whiteboard when drawing
 2020-04-29 16:41:07 -04:00
KDSBrowne
174660a27c fully hide media ovelay / fix whiteboard drawing with no cams 2020-04-29 20:23:29 +00:00
Anton Georgiev
06f6331433
Merge pull request #8725 from capilkey/fix-typing-indicator-spacing 
Fix the spacing in the typing indicator
 2020-04-29 12:48:08 -04:00
KDSBrowne
9d9528798f Add client logger and error code messages 2020-04-29 16:34:37 +00:00
Joao Siebel
7eb935f244 Enforce extractCredentials 2020-04-29 01:41:16 -03:00
KDSBrowne
942df3b1a6 add arrow to toggle userlist icon 2020-04-28 16:43:14 +00:00
Anton Georgiev
1a2d0ae11b
Merge pull request #9081 from ubahnverleih/shortcut-help-osx 
fixes shortcut help on mac browsers
 2020-04-28 09:30:25 -04:00