Commit Graph

7 Commits

Author SHA1 Message Date
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
Boris Grozev 87f8b91a96 Implements recording through a jirecon instance. 2014-12-30 19:57:43 +02:00
paweldomas f4004656a3 Adds functionality for authentication with external system. 2014-12-16 14:54:35 +01:00
paweldomas 0f6b6ae960 Adjusts recording button handling to the new focus(not finished). 2014-11-28 16:19:20 +01:00
paweldomas 7dc8102dee Replaces 'focus' occurrences with moderator for handling privileged functionalities. 2014-11-28 16:17:53 +01:00
paweldomas 6afcfb2598 Basic recording. 2014-11-28 16:05:10 +01:00