Richard Alam
b8af2fd5ee
Merge branch 'riadvice-fix-mute-meeting' into v2.0.x-release
2017-12-20 13:31:24 -08:00
Richard Alam
64a9cbfea1
- users come in as always unmuted, so no need to check muted flag
2017-12-20 13:30:35 -08:00
Lucas Zawacki
06f8b56a82
Merge remote-tracking branch 'prlanzarin1/ghost-webcams' into html5-video-media-flow
...
Conflicts:
bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
2017-12-20 18:43:33 -02:00
Lucas Zawacki
7df986da3d
Use more readable uids for bbb-webrtc-sfu
2017-12-20 18:23:56 -02:00
prlanzarin
362335f727
Made the users own webcam local instead of server-side
2017-12-20 20:06:27 +00:00
Lucas Zawacki
113aca16a2
Merge remote-tracking branch 'prlanzarin1/ghost-webcams' into html5-development-reconnect-issues
...
Conflicts:
bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
labs/bbb-webrtc-sfu/lib/video/VideoManager.js
labs/bbb-webrtc-sfu/lib/video/video.js
2017-12-20 17:20:56 -02:00
Richard Alam
f5502a1a2a
- allow passing of custom param (logo) to override default logo
2017-12-20 11:06:00 -08:00
prlanzarin
2fb291cec2
Fixed video session management on bbb-webrtc-sfu
...
This should solve the most severe cases of ghost webcams
2017-12-20 18:01:27 +00:00
prlanzarin
0cecd028fd
Changing the way the unshare webcam API is called to support user roles
2017-12-20 18:00:17 +00:00
Lucas Zawacki
2e3ea4e45f
Better video stop treatment in HTML5
2017-12-20 15:05:05 -02:00
Lucas Zawacki
0974c69d48
Small fixes on the server and iceCandidate sending
2017-12-20 14:56:28 -02:00
Ghazi Triki
276e9e2f5f
Fix put meeting and at muted status.
2017-12-20 17:32:10 +01:00
Richard Alam
58d8e70303
Merge pull request #4844 from ritzalam/fix-logouttimer-and-mod-only-msg
...
- hardcode logoutTimer to zero as we don't use this feature in the r…
2017-12-20 07:37:12 -08:00
Richard Alam
0bfe54a5af
Merge pull request #4843 from ritzalam/fix-issue-4660
...
- fix issue https://github.com/bigbluebutton/bigbluebutton/issues/4660
2017-12-20 07:37:02 -08:00
Lucas Zawacki
4aac6d8413
Tweaks on the video media flow
2017-12-20 00:32:31 -02:00
Paulo Lanzarin
1271cdc89d
Merge pull request #89 from lfzawacki/html5-development-reconnect-issues
...
HTML5 Videos Reconnect issues
2017-12-19 15:48:01 -02:00
Lucas Zawacki
1f5dd6f9a7
Move WS open/close events to component mount/unmount
2017-12-19 15:02:54 -02:00
Lucas Zawacki
afe4057bf2
Refactor html5 video tag creation to work with React style
2017-12-19 14:29:09 -02:00
KDSBrowne
1afe2f96bf
add comment
2017-12-19 08:23:40 -08:00
Oswaldo Acauan
eb4c89aefc
Fix bug when users re-validate after refresh
2017-12-19 10:19:47 -02:00
Richard Alam
8223a08029
- hardcode logoutTimer to zero as we don't use this feature in the release
...
- substitute keyworks in moderatorOnlyMessage
2017-12-18 12:52:33 -08:00
Richard Alam
ffc448f948
- fix issue https://github.com/bigbluebutton/bigbluebutton/issues/4660
2017-12-18 12:16:15 -08:00
Maxim Khlobystov
9f6d25ab45
Small comment.
2017-12-18 15:12:31 -05:00
Maxim Khlobystov
b9b73de839
Applied the private chat fix to Chat container.
2017-12-18 15:01:13 -05:00
Maxim Khlobystov
cab6d1a19e
Made Chat container a class component
2017-12-18 14:56:08 -05:00
Maxim Khlobystov
56b04d6831
Converted Chat component back to its stateless version.
2017-12-18 14:45:40 -05:00
Maxim Khlobystov
3937a01ffd
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into reopen-private-chat-bug
2017-12-18 13:04:42 -05:00
Maxim Khlobystov
6d84db0bd1
Linting.
2017-12-18 12:41:26 -05:00
Maxim Khlobystov
6130984c7c
Small cleanup - removed unnecesssary import statement.
2017-12-18 12:40:31 -05:00
Maxim Khlobystov
bb5c0a1390
Made sure that when we open a new chat, it is not on the list of closed ones anymore.
2017-12-18 12:38:46 -05:00
Maxim Khlobystov
eba7f9ffec
Convert the stateless Chat component into a class component.
2017-12-18 12:25:40 -05:00
Oswaldo Acauan
ced25948dd
Fix 401 on page refresh
2017-12-18 13:52:04 -02:00
Tainan Felipe
2c48392b2c
change intl id
2017-12-18 08:53:37 -02:00
Tainan Felipe
85d4f50e06
fix intl id
2017-12-18 08:19:38 -02:00
KDSBrowne
f0958a1a02
fix client not loading on iOS devices
2017-12-15 22:41:54 -08:00
KDSBrowne
0868e98240
add comment to actions-dropdown component
2017-12-15 20:32:17 -08:00
KDSBrowne
bc0ecf0b95
remove new line between imports
2017-12-15 20:27:47 -08:00
KDSBrowne
f1cd5f2d6e
move _.uniqueId() out of render function
2017-12-15 20:25:41 -08:00
KDSBrowne
284ab5e628
add button label
2017-12-15 13:06:22 -08:00
Anton Georgiev
d6aa4ed44d
Merge pull request #4733 from oswaldoacauan/fix-4700
...
Improvements on Presentation Management
2017-12-15 19:03:54 -02:00
Anton Georgiev
b2aa8d4571
Merge pull request #4816 from jfsiebel/hide-audio-labels
...
Hide audio labels
2017-12-15 18:42:58 -02:00
Anton Georgiev
bfa8637edc
Merge pull request #4830 from OZhurbenko/fix-issue-3576
...
Fixed round buttons' icon centering
2017-12-15 18:24:49 -02:00
Oleksandr Zhurbenko
4b344853ff
Disabling the Thickness and Colour menu items when the 'hand' tool is selected
...
Fixes #4808
2017-12-15 12:22:41 -08:00
Oleksandr Zhurbenko
b3450a46ff
Changed a default tool to Pencil
...
Fixes #4807
2017-12-15 12:10:38 -08:00
Oleksandr Zhurbenko
6de2b35cb2
Fixed round buttons' icon centering
...
Fixes #3576
2017-12-15 11:56:12 -08:00
Oswaldo Acauan
2eb2bbd8ab
Fix case when there is no current selected
2017-12-15 16:49:47 -02:00
KDSBrowne
5047c089ca
fix remaining console warnings
2017-12-15 09:45:14 -08:00
KDSBrowne
fbec9fc101
fix failed prop type: scrollPosition in Chat component
2017-12-15 09:18:35 -08:00
Lucas Zawacki
ecda3f460e
Don't send the 'media not flowing' event until we figure things out
2017-12-15 13:57:29 -02:00
Lucas Zawacki
1e514aad04
Merge branch 'bbb-webrtc-sfu' of github.com:prlanzarin/bigbluebutton-1 into bbb-webrtc-sfu
...
Removed several variables that were in this.state to this in the html5 video-dock component
Conflicts:
bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
2017-12-15 13:47:03 -02:00
