Commit Graph

3287 Commits

Author SHA1 Message Date
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
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
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
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
Lucas Zawacki
a370285f0b Capture several errors and crashes in client and bbb-webrtc-sfu 2017-12-14 16:42:13 -02:00
prlanzarin
7d5a722e12 Removed router for video-menu
Also removed unused class in video-dock css
2017-12-08 16:53:28 +00:00
prlanzarin
bdc89e0830 Refactored webcam share/unshare handlers 2017-12-08 16:52:37 +00:00
prlanzarin
06b273c251 Moved video-dock and video-menu collection communication to services 2017-12-08 16:38:51 +00:00
prlanzarin
c4acd83ee9 Removed unused states from video-dock component and refactored event listeners 2017-12-08 16:35:46 +00:00
prlanzarin
24e4317f9a Removed unused methods from actions bar component 2017-12-08 16:32:08 +00:00
prlanzarin
7e44806bc2 Removed unused Screenshare import 2017-12-08 16:26:28 +00:00
prlanzarin
89bd746f1c Changed webcam localization strings 2017-12-08 16:23:21 +00:00
Lucas Zawacki
4e2833aa07 Merge branch 'bbb-webrtc-sfu' of github.com:prlanzarin/bigbluebutton-1 into bbb-webrtc-sfu
Conflicts:
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
2017-12-05 17:58:58 -02:00
Lucas Zawacki
45ee2e7fa4 Adjustments to video reconnect code 2017-12-05 17:13:42 -02:00
prlanzarin
62f15fd55c Merge remote-tracking branch 'gutobenn/bbb-webrtc-sfu' into bbb-webrtc-sfu 2017-12-05 14:53:50 +00:00
Augusto Bennemann
3b6b7ec9d1 Update bower.json to use mconf's kurento-utils repository 2017-12-04 16:36:06 -02:00
Lucas Zawacki
1f2f5dc218 More reconnect logic and some translations 2017-12-01 21:40:25 -02:00
prlanzarin
f2bf5cca87 Fixed missing comma in english localization file 2017-11-29 14:02:55 +00:00
Augusto Bennemann
5d2a78a5ce HTML5 video iOS support 2017-11-28 17:31:36 -02:00
prlanzarin
b7c4115ba3 Moved kurento browser scripts to /client/lib and removed bower packaging from the HTML5 client 2017-11-27 16:22:48 +00:00
prlanzarin
fdca5356c3 Finished making bbb-webrtc-sfu answer in single path
Started standardizing video and screenshare RPC messages

Video now uses redis message routing
2017-11-24 18:59:40 +00:00
prlanzarin
248dc7fa08 Fixed HTML5 video API import
Added chrome extension ID to HTML5 screenshare call
2017-11-17 18:55:59 +00:00
prlanzarin
f43b77c19f Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu
Conflicts:
	bigbluebutton-html5/imports/startup/client/base.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
	bigbluebutton-html5/imports/ui/components/app/container.jsx
	bigbluebutton-html5/imports/ui/components/screenshare/service.js
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
	bigbluebutton-html5/imports/ui/components/video-dock/container.jsx
	bigbluebutton-html5/private/locales/en.json bigbluebutton-html5/server/main.js
2017-11-11 03:41:37 +00:00
prlanzarin
76f09e16ad Adding checks to show screenshare and video overlays according to config file 2017-11-11 01:36:55 +00:00
prlanzarin
2166b56304 Added toggle options for kurento video/screensharing in the HTML5 config yaml
Also made cam button respond to those config values
2017-11-10 21:08:40 +00:00
Gabriel Carvalho de Campes
d144aa0d00
Fixes settings service
settings service was missing a `||`
2017-11-07 14:21:43 -02:00
Oleksandr Zhurbenko
561709644d Fixed a bug with props in the polling container 2017-11-06 10:24:10 -08:00
Maxim Khlobystov
bc1a4c473c
Merge pull request #4581 from Gcampes/locale-browser-default
Set initial locale to be the browser one
2017-11-06 11:16:36 -05:00
prlanzarin
050d4c29bf Moved HTML5 video adjustment to a separate script 2017-11-06 15:42:00 +00:00
prlanzarin
e96fc385f1 Handling HTML5 screensharing stop
The action bar stop button is temporary
2017-11-06 15:39:55 +00:00
Gabriel Carvalho de Campes
24f66860f8 fix for browsers that do not support navigator.languages 2017-11-06 10:21:21 -02:00
Gabriel Carvalho de Campes
56fe843e1a Merge branch 'locale-browser-default' of https://github.com/gcampes/bigbluebutton into locale-browser-default 2017-11-06 10:06:33 -02:00
Gabriel Carvalho de Campes
fa52daf34a change initial locale setting 2017-11-06 10:06:05 -02:00
Anton Georgiev
1fdd1f1353
Merge pull request #4585 from Gcampes/end-meeting-fix
Fix issue that prevented end meeting button to appear
2017-11-02 12:40:12 -02:00
Anton Georgiev
8b80d7e9c2
Merge pull request #4621 from Tainan404/fix-upload-percentage
[HTML 5] Rounds upload percentage, localize messages in presentation uploader
2017-11-02 11:03:03 -02:00
Anton Georgiev
63eb812f85
Merge pull request #4578 from OZhurbenko/meteor-react-16-update
React 16 and packages update
2017-11-02 10:41:45 -02:00
Gabriel Carvalho de Campes
333916e59a Merge remote-tracking branch 'upstream/v2.0.x-release' into end-meeting-fix 2017-11-02 10:38:06 -02:00
Oleksandr Zhurbenko
e883995379 Breaking proptypes validation, sorry, any questions to @oswaldoacauan 2017-11-01 13:11:35 -07:00
Tainan Felipe
9db759074f moved intl messages to locales/en 2017-11-01 14:37:44 -02:00
Gabriel Carvalho de Campes
c9d7c9cae4
fix endmeeting handler with incorrect name 2017-11-01 13:47:14 -02:00
Tainan Felipe
c1df1da3c4 rounds the file upload percentage 2017-11-01 10:19:18 -02:00
Oleksandr Zhurbenko
6ba09a3184 Fixed a logClient function call 2017-10-31 14:52:18 -07:00
Anton Georgiev
8853d562ce
Merge pull request #4497 from Gcampes/audio-refactor
[HTML5] Refactor Audio
2017-10-31 15:39:37 -02:00
Gabriel Carvalho de Campes
2cca0c1724 change device selector key generation 2017-10-31 15:34:06 -02:00
Gabriel Carvalho de Campes
5237f200b5
removes console.log 2017-10-31 15:29:44 -02:00
Gabriel Carvalho de Campes
2e982114b5 Fix locale fetching issues 2017-10-31 15:13:44 -02:00
Gabriel Carvalho de Campes
fde5d56d87 change ask permissions timing, small code fixes 2017-10-31 08:53:06 -02:00