Anton Georgiev
|
0515166405
|
Merge branch 'bbb-webrtc-sfu' of github.com:prlanzarin/bigbluebutton-1 into test-4661
|
2017-12-22 10:54:46 -05:00 |
|
Paulo Lanzarin
|
761cdfaedd
|
Merge pull request #92 from prlanzarin/video-reconnection
Ghost webcams and merging with upstream
|
2017-12-22 10:55:24 -02:00 |
|
prlanzarin
|
31fb95bf72
|
Removed wrong video peer stop procedure and reset the kurento.yaml config file
|
2017-12-22 12:30:24 +00:00 |
|
Richard Alam
|
3264f8a7d5
|
Merge branch 'capilkey-breakout-room-closing-warning' into v2.0.x-release
|
2017-12-21 13:13:28 -08:00 |
|
Richard Alam
|
763c2c51c0
|
- remove trace log
|
2017-12-21 13:12:58 -08:00 |
|
Richard Alam
|
becf60b389
|
Merge branch 'breakout-room-closing-warning' of https://github.com/capilkey/bigbluebutton into capilkey-breakout-room-closing-warning
|
2017-12-21 12:52:50 -08:00 |
|
Chad Pilkey
|
5b367f6101
|
add a minute warning when breakout rooms are going to close
|
2017-12-21 15:13:52 -05:00 |
|
Richard Alam
|
fb214b1370
|
Merge pull request #4862 from ritzalam/change-ejected-msg
Change ejected msg
|
2017-12-21 11:13:35 -08:00 |
|
Richard Alam
|
4d75664ca2
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into change-ejected-msg
|
2017-12-21 11:12:15 -08:00 |
|
Richard Alam
|
d13b01def7
|
- change all kick works to remove
|
2017-12-21 11:11:32 -08:00 |
|
Richard Alam
|
d1ddbd091b
|
Merge pull request #4861 from ritzalam/set-mute-on-start
- implement muteOnstart by passing on create API or using bigbluebut…
|
2017-12-21 10:56:41 -08:00 |
|
Richard Alam
|
78afb91562
|
- implement muteOnstart by passing on create API or using bigbluebutton.properties in bbb-web instead of setting it in config.xml
|
2017-12-21 10:40:44 -08:00 |
|
prlanzarin
|
8608fd9f94
|
Tooltips for video buttons and actions-bar container service calls fixes
|
2017-12-21 17:40:00 +00:00 |
|
prlanzarin
|
51b62ed30d
|
Added checking for HTML5 webcams
This should prevent blank webcams on the flash client
|
2017-12-21 17:38:39 +00:00 |
|
prlanzarin
|
3a72afa350
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection
|
2017-12-21 17:37:07 +00:00 |
|
Richard Alam
|
bc5df11915
|
Merge pull request #4857 from ritzalam/custom-copyright
- allow to pass custom copyright text using create API
|
2017-12-20 14:30:44 -08:00 |
|
Richard Alam
|
d09abe92e4
|
- allow to pass custom copyright text using create API
|
2017-12-20 14:28:01 -08:00 |
|
Richard Alam
|
00140f0cca
|
Merge pull request #4852 from ritzalam/all-custom-log
- allow passing of custom param (logo) to override default logo
|
2017-12-20 13:32:11 -08:00 |
|
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 |
|
Tainan Felipe
|
0037ebd77d
|
remove locales.js which is unnecessary
|
2017-12-20 15:15:49 -02:00 |
|
Lucas Zawacki
|
2e3ea4e45f
|
Better video stop treatment in HTML5
|
2017-12-20 15:05:05 -02:00 |
|
Tainan Felipe
|
5c5125c7d2
|
fix issue #4847
|
2017-12-20 14:56:56 -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 |
|
Tainan Felipe
|
523caf226d
|
fix settings for mobile screen
|
2017-12-19 09:13:37 -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 |
|