prlanzarin
b3566755ef
Removed *sw* entry from .gitignore
2018-01-04 20:26:10 +00:00
prlanzarin
7f06664711
Refactored the flash webcam pattern checking
2018-01-04 20:25:22 +00:00
prlanzarin
dfb5170e5d
Finished filtering out HTML5 and Flash webcams using stream name patterns
2018-01-04 16:24:50 +00:00
prlanzarin
02a46387e0
Filter out html5 cameras from flash client
2017-12-22 19:25:25 +00:00
prlanzarin
3f8e7c308c
Revert "Added checking for HTML5 webcams"
...
This reverts commit 51b62ed30d
2017-12-22 18:30:40 +00:00
prlanzarin
31fb95bf72
Removed wrong video peer stop procedure and reset the kurento.yaml config file
2017-12-22 12:30:24 +00: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
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
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
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
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
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
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
Anton Georgiev
c9c6797fc9
Merge pull request #4788 from antobinary/audio-work-3
...
Handle dial-in users in HTML5
2017-12-15 13:44:51 -02:00
Joao Siebel
218890d8a6
Alter status tooltip to match selected status
2017-12-15 11:11:28 -02:00
Lucas Zawacki
a370285f0b
Capture several errors and crashes in client and bbb-webrtc-sfu
2017-12-14 16:42:13 -02:00
Anton Georgiev
9a92d972d8
Merge pull request #4822 from bigbluebutton/antobinary-update-index.html
...
Update index_html5_vs_flash.html
2017-12-14 14:00:14 -02:00
Anton Georgiev
696974d3b7
Update index_html5_vs_flash.html
2017-12-14 10:58:06 -05:00
Anton Georgiev
1b939ad2aa
Merge pull request #4803 from antobinary/adjust-polls-4778
...
Poll updated event - drop requesterId/presenterId and rename event
2017-12-14 13:25:34 -02:00
Joao Siebel
845692b9e5
Merge remote-tracking branch 'upstream/v2.0.x-release' into hide-audio-labels
2017-12-14 09:01:38 -02:00
Anton Georgiev
334c80083e
Merge pull request #4753 from jfsiebel/html5-tooltip
...
Add tooltip for buttons without label
2017-12-13 17:13:28 -02:00
Anton Georgiev
b450db91f7
Merge pull request #4683 from KDSBrowne/z14-fix-userlist-keyboard-accessibility
...
Fix user-list keyboard accessibility
2017-12-13 16:25:44 -02:00
Anton Georgiev
a30026a5ed
Merge pull request #4804 from OZhurbenko/fix-edge-default-locale
...
Fixed a problem with the default locale selection in Edge
2017-12-12 16:16:38 -02:00
Anton Georgiev
6e15b91cde
Merge pull request #4800 from OZhurbenko/fix-userlist-sorting
...
Fixed sorting in the user list
2017-12-12 16:14:24 -02:00
Oleksandr Zhurbenko
ed7b3f619a
Corrected the detection of the clear_status
2017-12-12 09:27:51 -08:00
