Commit Graph

7698 Commits

Author SHA1 Message Date
Anton Georgiev
ff1357cbbd
Revert "Improve audio reconnection for muted users for 2.2" 2020-06-22 16:28:22 -04:00
Fred Dixon
86c6451bcc
Make end meeting more clear 2020-06-22 10:54:23 -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
Anton Georgiev
af21f695ee
Update bigbluebutton-html5/private/locales/en.json 2020-06-19 16:25:24 -04:00
Anton Georgiev
c23611ac01
Update bigbluebutton-html5/private/locales/en.json 2020-06-19 16:25:16 -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
Anton Georgiev
0a0af871fc Pulled HTML5 locales on June 18, 2020 2020-06-18 20:39:25 +00: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
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
2a13cb5673 Update react-player to 2.2.0 2020-06-09 17:34:22 -03: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
Anton Georgiev
123f016610 Pulled HTML5 locales on June 5, 2020 2020-06-05 17:02:36 +00:00
Anton Georgiev
8c077aaf63
Merge pull request #9782 from jfsiebel/resubscribe-when-role-changed
Subscribe to collections when user role change
2020-06-05 12:49:41 -04:00
Joao Siebel
6c6825d101 Subscribe to collections when user role change. close #9733 2020-06-05 10:32:05 -03:00
Anton Georgiev
1ba6d10c0a
Update copyright year in html5 client 2020-06-05 09:20:18 -04: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
Joao Siebel
e3692e5321 Clear video streams collection on meeting end. close #9154 2020-06-03 13:29:44 -03: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
Joao Siebel
189f9c8e61 Fix user-settings publisher log 2020-06-02 09:46:03 -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
Joao Siebel
74c34d0c4a Use main room custom parameters in breakouts room. close #9612 2020-06-01 09:13:03 -03:00
Anton Georgiev
7b883fbe49 Pulled HTML5 locales on May 29, 2020 2020-05-29 13:49:32 -04: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
29afdafd3e
Merge pull request #9658 from konkret-devils/v2.2.x-release
Add bbb_show_public_chat_on_login as a join (co-) parameter
2020-05-29 12:42:59 -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
Martin Beckmann
630f3393aa Integration of PR #9292 (by weeman1337) and PR #9658 (by mantridereso)
..oops, forgot to update settings.yml
2020-05-26 15:17:11 +02:00
Martin Beckmann
c3f0447105 Integration of PR #9292 (by weeman1337) and PR #9658 (by mantridereso) 2020-05-26 15:07:37 +02:00
Anton Georgiev
f4742e8a9f
Merge pull request #9683 from KDSBrowne/issue-9679
Fix non userData defined shortcuts not functioning
2020-05-26 08:57:48 -04:00
KDSBrowne
4e68ea07fd fix non userData shortcuts not functioning 2020-05-26 12:12:57 +00:00
Anton Georgiev
4a38524778 Logging with JSON stringify was leading to crashes. Reverting, need to investigate further 2020-05-24 08:22:10 -04:00
Martin Beckmann
ea3926e8ef attempt to introduce an additional UserSettings parameter 'bbb_show_public_chat_on_login' as a co-parameter of 'bbb_show_participants_on_login' (the former intended to only have an effect if the latter is 'true') 2020-05-23 22:28:56 +02:00
Martin Beckmann
d6956a5516 test... 2020-05-23 21:43:26 +02:00
Martin Beckmann
f9c7c20d5a test... 2020-05-23 21:40:39 +02:00
Martin Beckmann
51d3b3a94d test... 2020-05-23 20:44:11 +02: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
ede8d82384
Merge pull request #9641 from antobinary/locales-may-22
Pulled HTML5 locales May 22, 2020
2020-05-22 11:55:19 -04:00
Anton Georgiev
c9faef96c9 Pulled HTML5 locales May 22, 2020 2020-05-22 11:48:11 -04: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
prlanzarin
8eb6235b1e sip.js/kurento-utils: remove default 3rd party STUN servers
Removing 3rd party default STUN servers from those dependencies as to prevent unexpected behaviour
2020-05-21 04:31:40 +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
9219621cd2 Add package lock for react-player update 2020-05-18 15:46:18 -03: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
Lucas Zawacki
860c85e09c Update react-player library 2020-05-18 12:06:06 -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
Paulo Lanzarin
a6a5aaf3d9 screenshare: typo in applyConstraints 2020-05-14 17:44:53 +00: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
prlanzarin
fe8e719757 kurento-extension: add optional stream paremeter to avoid gUM/gDM if already done 2020-05-14 16:41:47 +00:00
prlanzarin
79c435f9f9 kurento-utils: add a fallback for getTracks
Add a fallback in case getTracks isnt available (ahem safari 12.1). Use addStream directly on the peer instead
2020-05-14 16:41:33 +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
yogiks
360fce9781 Included Kannada 2020-05-11 15:40:00 -04:00
yogiks
228b3c7327 Pulled Kannada (kn.json) from Transifex 2020-05-11 15:39:40 -04:00
Anton Georgiev
bff29e28ad Pulled HTML5 locales May 11, 2020 2020-05-11 15:36:31 -04: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