Commit Graph

1813 Commits

Author SHA1 Message Date
hristoterezov 4d25b139cc Fixes some issues caused by the merge. 2015-01-07 17:47:48 +02:00
hristoterezov 6ce48a5b7b Merge branch 'master' of github.com:jitsi/jitsi-meet
Conflicts:
	app.js
	index.html
	libs/colibri/colibri.focus.js
	libs/modules/statistics.bundle.js
	moderator.js
	modules/UI/videolayout/VideoLayout.js
	muc.js
2015-01-07 17:14:10 +02:00
hristoterezov 69b0e2ad32 Creates UI module. 2015-01-07 16:54:03 +02:00
hristoterezov 652412cd4f Fixes issue with local audio levels. 2015-01-05 17:08:49 +02:00
paweldomas 6cc8b63104 Does not flood with missing "Jid for SSRC" warnings for outdated stats(removed streams). 2015-01-05 13:07:59 +01:00
paweldomas 4fb7001b00 Converts 'constraints' to local variable in order to fix desktop sharing issues(audio constraints were retained in global var and get desktop stream failed). 2015-01-05 13:07:28 +01:00
hristoterezov efc161dacd Fixes issue with obtaining audio/video permissions when simulcast is disabled. 2014-12-23 16:24:56 +02:00
George Politis 2ee5a92ef0 Adds comment to modules/RTC/MediaStream.js 2014-12-22 15:08:49 +01:00
hristoterezov 4a991f7187 Adds package.json files for our browserify modules. 2014-12-22 15:46:24 +02:00
hristoterezov ec5e0f09ea Moves require to top for the RTC module. 2014-12-22 11:03:21 +02:00
hristoterezov a1da42ff00 Fixes the filename in require call of data channels file. 2014-12-19 17:49:22 +02:00
hristoterezov 5b34a66cb6 Implements RTC module. 2014-12-19 15:59:08 +02:00
hristoterezov c6d8e34779 Implements statistics module. 2014-12-17 18:21:25 +02:00