Commit Graph

19234 Commits

Author SHA1 Message Date
KDSBrowne
cc32e1d2d9 edit css to prevent disappearing background 2018-01-16 09:03:14 -08:00
Anton Georgiev
5bac8f782a
Merge pull request #4968 from OZhurbenko/fix-issue-4897
Corrected a few labels missed in #4929
2018-01-15 19:18:22 -02:00
Oleksandr Zhurbenko
bb72cb7b65 Adjusted the pull request to the recent changes 2018-01-15 12:59:09 -08:00
Anton Georgiev
455d6f8638
Merge pull request #4929 from OZhurbenko/fix-issue-4897
Changed all the references of "kick" to "remove"
2018-01-15 18:40:48 -02:00
Oleksandr Zhurbenko
f6ed7c3575 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fix-issue-4897 2018-01-15 12:33:29 -08:00
Fred Dixon
709accb882
Merge pull request #4965 from ffdixon/update-bbb-conf
Update settings-production.json when assigning hostname
2018-01-15 12:33:47 -05:00
Fred Dixon
e6156d90f7 Update settings-production.json when assigning hostname 2018-01-15 11:31:36 -06:00
Anton Georgiev
1e25a6d4e1
Merge pull request #4955 from prlanzarin/video-upstream-errors
WebRTC media updates
2018-01-15 14:40:53 -02:00
Anton Georgiev
ddfc5e5248
Merge pull request #4846 from Tainan404/fix-settings-mobile
Change modal settings styles.
2018-01-15 13:22:56 -02:00
Fred Dixon
6a1264ec7e
Merge pull request #4957 from riadvice/webcams-only-for-moderator-on-off
Disable webcam button in media column for all users when webcamsOnlyForModerator is on
2018-01-15 07:47:08 -05:00
Ghazi Triki
e89aadb3a6 Disable webcam button in media column for all users when webcamsOnlyForModerator is on. 2018-01-15 12:33:24 +01:00
prlanzarin
acc9650370 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into video-upstream-errors 2018-01-12 21:39:24 +00:00
prlanzarin
f54214c4e1 Merge remote-tracking branch 'mconftec/disable-share-webcam-button' into video-upstream-errors 2018-01-12 21:31:01 +00:00
prlanzarin
8594ce169d Merge remote-tracking branch 'mconftec/fixes-lucas' into video-upstream-errors 2018-01-12 20:02:45 +00:00
Lucas Fialho Zawacki
0d3466a1db Use service joinedVideo in the correct stage of video sharing flow 2018-01-12 19:44:56 +00:00
Lucas Fialho Zawacki
68abf367d0 Prevent errors on html5 video when socket disconnects 2018-01-12 19:37:05 +00:00
Lucas Fialho Zawacki
b6abec579a Better clean up on the bbb-wbertc serverside to fix html5 video problems 2018-01-12 19:36:57 +00:00
Lucas Fialho Zawacki
cdb961f724 Wait one tick before resizing HTML5 videos 2018-01-12 19:36:23 +00:00
Lucas Fialho Zawacki
ce7d720a13 Fix problems on video tags if camera is busy 2018-01-12 19:36:15 +00:00
Lucas Zawacki
552b2ab665 Detect online/offline browser and open/close WS accordingly 2018-01-12 19:36:07 +00:00
prlanzarin
67f297dd95 Removed unused screenshare container from videodock and fixed stop message userId 2018-01-12 18:51:07 +00:00
prlanzarin
4fc1e3ea85 Fixed incorrect fetching of userId in the video-dock component 2018-01-12 18:39:16 +00:00
Richard Alam
d60a2a2782
Merge pull request #4945 from riadvice/moderator-message-ui
Show moderator message header in bold
2018-01-12 07:35:27 -08:00
Fred Dixon
5f96cf48ad
Merge pull request #4953 from riadvice/fix-firefox-webrtc
Delay showing confirmation buttons in WebRTCEchoTest under firefox
2018-01-12 09:21:55 -05:00
Ghazi Triki
3ffbc3a12c Delay showing configramtion buttons in WebRTCEchoTest under firefox browser. 2018-01-12 15:17:26 +01:00
Fred Dixon
c35887cc67
Merge pull request #4946 from riadvice/2.0-ui-fixes
Fix ScreenshareViewWindow scroll-bars in original video size mode
2018-01-12 00:08:06 -05:00
Ghazi Triki
4bc7279c1c Fix ScreenshareViewWindow scroll-bars in original video size mode. 2018-01-11 21:34:09 +01:00
Ghazi Triki
d4fda31d00 Show moderator message header in bold. 2018-01-11 17:55:03 +01:00
Anton Georgiev
4ecc54ac29
Merge pull request #4801 from Tainan404/fix-moderator-ends
Add screen to when the meeting is closed.
2018-01-11 14:02:13 -02:00
Anton Georgiev
9077bc24cd
Merge pull request #4815 from antobinary/fix-audio-locale-change
Fix audio loss on locale change
2018-01-11 13:59:43 -02:00
Fred Dixon
3acd98bab6
Merge pull request #4943 from riadvice/2.0-ui-fixes
Fix alpha value for ScreenshareViewWindow change display button
2018-01-11 08:45:52 -05:00
Ghazi Triki
526b2b12fb Fix alpha value for ScreenshareViewWindow change display button. 2018-01-11 14:38:21 +01:00
Tainan Felipe
8ae1fd1820 Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-moderator-ends 2018-01-11 09:19:56 -02:00
Augusto Bennemann
a8888e49ad Prevent multiple clicks on share/unshare video button 2018-01-10 23:16:49 -02:00
Tainan Felipe
5e96068a6d remove multiplication for 1 2018-01-10 16:55:33 -02:00
Tainan Felipe
273ea0dbc6 Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-settings-mobile 2018-01-10 16:42:39 -02:00
Oleksandr Zhurbenko
7871681448 Changed all the references of kick to remove, to be consistent 2018-01-09 14:28:48 -08:00
Anton Georgiev
a2ff3e6480 remove AudioComponent as we do not render anything 2018-01-09 17:07:29 -05:00
Richard Alam
9ff881f138
Merge pull request #4925 from riadvice/webcams-only-for-moderator-on-off
Switch webcamsOnlyForModerator on and off
2018-01-09 12:48:19 -08:00
Anton Georgiev
e9093a6c19 Merge branch 'v2.0.x-release' into fix-audio-locale-change 2018-01-09 14:52:49 -05:00
Ghazi Triki
9cad3facc3 Set webcamsOnlyForModerator in MeetingActor when the meeting is creator. 2018-01-09 20:47:03 +01:00
Ghazi Triki
8f47e7b7de Remove webcamsOnlyForModerator from enter API response. 2018-01-09 18:14:58 +01:00
Ghazi Triki
ed1467550f Automatically subscribe/unsubcribe to video streams when webcamsOnlyForModerator value changes. 2018-01-09 17:01:17 +01:00
Richard Alam
68a4dce92e
Merge pull request #4922 from ritzalam/mute-on-start
- fix issue where muteOnStart doesn't work when set in bigbluebutton…
2018-01-09 07:47:49 -08:00
Richard Alam
e9df643af4 - fix issue where muteOnStart doesn't work when set in bigbluebutton.properties 2018-01-09 07:46:16 -08:00
Anton Georgiev
0c8be1cc0b
Merge pull request #4833 from KDSBrowne/x.0.4-ios-hide-fullscreen
Hide fullscreen option for iOS devices
2018-01-09 13:29:53 -02:00
Anton Georgiev
980a6490ec
Merge pull request #4832 from KDSBrowne/x.0.3-fix-console-warnings
Fix Invalid prop 'children[2]' supplied to `DropdownList`
2018-01-09 13:28:17 -02:00
Anton Georgiev
0392634f57
Merge pull request #4841 from MaximKhlobystov/reopen-private-chat-bug
[HTML5 Client] Fix for reopening private chat after using X button
2018-01-08 18:42:36 -02:00
Anton Georgiev
415a8ec5df
Merge pull request #4915 from OZhurbenko/update-meteor-16
Updated Meteor to 1.6.0.1
2018-01-08 18:39:16 -02:00
Ghazi Triki
55f4e7cb7c Revert webcamsOnlyForModerator feature in VideoEventMapDelegate. 2018-01-08 20:59:45 +01:00