bigbluebutton-Github/bigbluebutton-html5
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
..
.meteor Initial packages update 2017-10-23 17:09:40 -07:00
client Moved kurento browser scripts to /client/lib and removed bower packaging from the HTML5 client 2017-11-27 16:22:48 +00:00
imports Merge remote-tracking branch 'prlanzarin1/ghost-webcams' into html5-development-reconnect-issues 2017-12-20 17:20:56 -02:00
log
private Merge branch 'bbb-webrtc-sfu' of github.com:prlanzarin/bigbluebutton-1 into bbb-webrtc-sfu 2017-12-15 13:47:03 -02:00
public Update bower.json to use mconf's kurento-utils repository 2017-12-04 16:36:06 -02:00
server Fixed HTML5 video API import 2017-11-17 18:55:59 +00:00
tests/webdriverio Added an instance of the mobile Chrome (iPhone 6). 2017-08-28 11:52:15 -04:00
.eslintignore Improve ESLint rules 2017-06-02 20:42:13 +00:00
.eslintrc.js Add missing packages and fix formating 2017-06-05 13:26:47 +00:00
.gitignore Add missing configuration file 2017-02-06 19:14:48 +00:00
package-lock.json Breaking proptypes validation, sorry, any questions to @oswaldoacauan 2017-11-01 13:11:35 -07:00
package.json Handling HTML5 screensharing stop 2017-11-06 15:39:55 +00:00
transifex.sh Indentations cleanup. 2017-10-21 21:30:24 -04:00