Felipe Cecagno 9a2c605866 Merge branch 'master' into multicamera-0.81 ... Conflicts: bigbluebutton-client/branding/default/style/css/BBBDefault.css bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as		2013-09-29 21:19:29 -03:00
..
core	Merge branch 'master' into multicamera-0.81	2013-09-29 21:19:29 -03:00
matterhorn	support ingest for matterhorn 1.4	2013-06-07 16:27:14 -05:00
mconf/scripts	the previous implementation to enable multiple get_recordings_url wasn't working; the thing is that the properties must be global to be visible inside the function definitions; now it's working properly	2013-06-03 14:23:22 -03:00
presentation	Change the background color of the video area to white to match	2013-08-27 11:27:13 -04:00
slides	rap-worker now keeps track of the processing time of a recording; a file called processing_time is generated during the process phase, and this information is added to metadata.xml when the recording is published - this information isn't retrieved by getRecordings because no modification was done on bbb-web to include this information, but at least it's there so the sysadmin can check how long does a recording take to get processed	2013-06-13 17:13:20 -03:00
changelog.md	a log file by meeting in archive phase	2013-04-29 16:03:21 -05:00
deploy.sh	Merge branch 'master' into multicamera-0.81	2013-09-29 21:19:29 -03:00