Commit Graph

19251 Commits

Author SHA1 Message Date
Fred Dixon
346d127cf0
Merge pull request #4973 from riadvice/logout-feedback
Implemented "user rating feedback on logout" feature
2018-01-16 15:56:49 -05:00
Ghazi Triki
cf92e1aeef Implemented "user rating feedback on logout" feature. 2018-01-16 20:37:05 +01:00
Anton Georgiev
748ee1279a
Merge pull request #4941 from MaximKhlobystov/mute-button-icon-update-fix
[HTML5 Client] Fix for Mute/Unmute button's icon update.
2018-01-16 14:06:30 -02:00
Maxim Khlobystov
893067139b Declared the muteHandle variable. 2018-01-16 10:56:31 -05:00
Anton Georgiev
3366bc32b0
Merge pull request #4851 from Tainan404/fix-language-selector
Language selector of the application, each option appears in its native language.
2018-01-16 13:40:03 -02:00
Anton Georgiev
a4d57ac4b6
Merge pull request #4963 from MaximKhlobystov/hangup-audio-userlist-fix
[HTML5 Client] Fix for the issue with users disappearing from userlist when hanging up audio.
2018-01-16 13:39:38 -02: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
Maxim Khlobystov
d9955ae286 Small cleanup. 2018-01-15 16:13:18 -05:00
Maxim Khlobystov
1394984be7 Made the mute/unmute observer work. 2018-01-15 16:01:57 -05: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
Maxim Khlobystov
4ee059f381 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into hangup-audio-userlist-fix 2018-01-15 11:47:35 -05:00
Maxim Khlobystov
71c2d16918 Made sure user is removed from userlist only in case of dial-in (not web) users. 2018-01-15 11:47:19 -05: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
2725b80ac4 revert env 2018-01-11 10:48:24 -02:00
Tainan Felipe
18011fe3da Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-language-selector 2018-01-11 10:35:31 -02: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
Maxim Khlobystov
aeb1aeb14b Made sure the mute/unmute button is updated when Flash client mutes/unmutes HTML5 client. 2018-01-10 15:51:10 -05:00
Maxim Khlobystov
12e474fa01 Doing the mute/unmute flag change inside the Audio Manager instead of using Mongo observer. 2018-01-10 15:41:21 -05: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
Tainan Felipe
2f00d0b612 add directory via absoluteFilePathh 2018-01-10 15:03:06 -02:00