Commit Graph

23532 Commits

Author SHA1 Message Date
Anton Georgiev
0d1a351842
Update audio overlay to omit BigBlueButton word
Closes #6562
2019-01-15 17:35:47 -05:00
Fred Dixon
fb3bce1d7d
Merge pull request #6561 from kepstin/caption-fixes
Wait until the media is ready before initializing the acorn player.
2019-01-15 14:33:48 -05:00
Calvin Walton
04d31d300f Wait until the media is ready before initializing the acorn player.
Previously, the acorn player was being initialized before the asynchronous
load of captions information completed, meaning that the acorn player didn't
know there were caption tracks, and the CC selector control wasn't available.

Fixes #6463
2019-01-15 14:15:42 -05:00
Anton Georgiev
f1772f18f8 reactive amIModerator on navbar dropdown 2019-01-15 18:08:42 +00:00
Anton Georgiev
408a0942a5
Merge pull request #6544 from Tainan404/issue-6518
Fix getBoundingClientRect error on console.
2019-01-15 11:41:43 -05:00
Anton Georgiev
a9459041c0
Merge pull request #6552 from vitormateusalmeida/issue-5691
Changed default color in the whiteboard toolbar #5691
2019-01-15 10:57:25 -05:00
Tainan Felipe
4a396fac10 Fix error getBoundingClientRect at console 2019-01-15 13:31:11 -02:00
Lucas Zawacki
e883d3a2b0 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into master-presentation-ui 2019-01-15 10:31:12 -03:00
Lucas Zawacki
2c98ecb2b8 Aesthetic fixes to buttons 2019-01-15 10:16:01 -03:00
gustavotrott
c21bb693b4 Store in session if can generate ice candidates, change timeout to 5secs, display error msgs 2019-01-14 22:45:32 -02:00
Anton Georgiev
96c3777661
Merge pull request #6554 from BobakOftadeh/fix-modal-close
Fix closing about modal
2019-01-14 16:40:25 -05:00
Anton Georgiev
b4bd4d1725 recording indicator checks if iAmModerator; end meeting menu 2019-01-14 21:39:03 +00:00
Bobak Oftadeh
7153782c39 Fix closing about modal 2019-01-14 12:23:46 -08:00
Maxim Khlobystov
65522aa272 Make sure the preview video and the dropdown are in sync (set the default preview webcam before displaying the preview video) 2019-01-14 15:18:28 -05:00
Vitor Mateus
5a21ae41ef Changed default color in the whiteboard toolbar #5691 2019-01-14 16:11:06 -02:00
Lucas Zawacki
550bbcd492 Share synchronized youtube video in presentation area 2019-01-14 14:40:27 -03:00
João Francisco Siebel
56322c5060 fix ejecting users when private chat is locked. fix #6434 2019-01-14 14:58:01 -02:00
Vitor Mateus
66d23012a1 Changed variable name 2019-01-14 14:23:11 -02:00
KDSBrowne
842507e069 remove unnecessary function in user-options container 2019-01-14 16:20:18 +00:00
Gustavo Trott
a875b0b386 Undo changes in askDevicesPermissions 2019-01-14 12:41:44 -02:00
Gustavo Trott
a81705339b Avoid call tryGenerateIceCandidates twice 2019-01-14 11:59:47 -02:00
Vitor Mateus
a9989e1107 Fix chat alert (push and audio) #6430 2019-01-14 11:23:35 -02:00
Tainan Felipe
3ccddd60d5 Remove left overs from merge 2019-01-14 10:23:41 -02:00
Gustavo Trott
1767d87f60 Copy ice servers from kurento-utils.js and Close peerConnection 2019-01-14 10:03:19 -02:00
Tainan Felipe
0918cc4084 Merge remote-tracking branch 'upstream/master' into issue-6392 2019-01-14 09:30:59 -02:00
Tainan Felipe
e3ae0397c4 Fix button for mobile on error screen 2019-01-14 09:15:49 -02:00
Anton Georgiev
afb812b531 WIP end meeting menu 2019-01-12 00:20:04 +00:00
KDSBrowne
d90bf00414 when breakout rooms started hide create menu option 2019-01-11 21:16:37 +00:00
Anton Georgiev
6c561b102c
Merge pull request #6534 from KDSBrowne/2.2-add-take-presenter
Add take presenter role option to actions menu
2019-01-11 14:32:39 -05:00
KDSBrowne
6205059070 edit formatted string / use ternary operator / omit passing Auth.userId 2019-01-11 19:15:31 +00:00
Anton Georgiev
01bedb5ec1
Merge pull request #6474 from vitormateusalmeida/fix-issue-6457
Fix z-index in presentation
2019-01-11 13:32:41 -05:00
Anton Georgiev
65024309d1
Merge pull request #6539 from BobakOftadeh/audio-echo-fix
Fix echo test bug where it stays active after closing
2019-01-11 11:58:04 -05:00
Bobak Oftadeh
a821fef9c2 Fixed echo test bug 2019-01-11 16:49:52 +00:00
Anton Georgiev
4c0d2c0bd3
Merge pull request #6538 from bigbluebutton/antobinary-shared-notes-width
Reduce the width of shared notes default width
2019-01-11 11:05:25 -05:00
Anton Georgiev
265e23af4b
Reuse variable when setting default noteWidth 2019-01-11 11:02:19 -05:00
Anton Georgiev
8629fb48e4
Reduce the width of shared notes default width
.. to match the default width of chat module. Closes #6529
2019-01-11 10:48:31 -05:00
Anton Georgiev
fa0c67b62a
Merge pull request #6537 from jfsiebel/lock-status-not-updating
Fix problem with user list don't updating on lock change
2019-01-11 10:33:50 -05:00
João Francisco Siebel
3a2b8f969f fix lock don't updating user list. close #6524 2019-01-11 10:56:54 -02:00
Gustavo Trott
954f7862d6 Fix video receive on Safari (and ios webview) without media grant 2019-01-10 21:25:39 -02:00
Gustavo Trott
fdf50b3ab7 Validade if Safari can send ICE Candidates before open RTC to receive video 2019-01-10 21:24:25 -02:00
Gustavo Trott
87b4306e7f Add tryGenerateIceCandidates to verify and ask media permission if necessary 2019-01-10 21:22:14 -02:00
Fred Dixon
8d00f3b5d3
Merge pull request #6536 from ffdixon/update-bbb-conf-8
Moved apply-config.sh to before restart
2019-01-10 17:52:06 -05:00
Fred Dixon
7c2f2d5592 Moved apply-config.sh to before restart 2019-01-10 16:48:53 -06:00
Gustavo Trott
ec49bdfda2 Nothing changed, this commit is really necessary because for some unknown reason all editors change whole file when save file, even editing in vi 2019-01-10 19:43:30 -02:00
Gustavo Trott
219cad3234 Verify if Safari can generate iceCandidates else askDevicesPermission 2019-01-10 19:25:23 -02:00
Anton Georgiev
e57b4dce68
Merge pull request #6490 from prlanzarin/gDM-support
Add support for getDisplayMedia on Chrome and Edge
2019-01-10 14:52:44 -05:00
KDSBrowne
484403f4c1 fix console error for array elements missing keys 2019-01-10 18:51:19 +00:00
KDSBrowne
0fc148af55 add create breakout room option to user manage menu 2019-01-10 18:25:08 +00:00
KDSBrowne
f11fed7bd7 add take presenter role to actions menu 2019-01-10 16:10:45 +00:00
Fred Dixon
b1cf09879c
Merge pull request #6527 from pedrobmarin/notes-extra-config
Extra config to be used with generic Etherpad servers
2019-01-10 08:22:36 -05:00