Felipe Cecagno
|
9a7bae79a8
|
Merge branch '090-new-videodock' into HEAD
Conflicts:
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
record-and-playback/deploy.sh
|
2015-01-28 20:33:28 -02:00 |
|
Felipe Cecagno
|
fe348e0065
|
fixed the deploy scripts for record and playback
|
2015-01-28 19:20:11 -02:00 |
|
Felipe Cecagno
|
f52a0299a6
|
fixed the deploy script used to deploy the rap dev environment
|
2014-11-12 17:21:54 -02:00 |
|
Felipe Cecagno
|
820001214c
|
improving the rap deployment script
|
2013-06-17 14:35:23 -03:00 |
|
Felipe Cecagno
|
df37f484d7
|
insert the scroll bar on the chat automatically instead of grow the div indefinitely; little improvement on the deploy script for the recordings
|
2012-10-11 13:45:14 -03:00 |
|
Gustavo Salazar
|
f5ee8b6cbf
|
Update license.
|
2012-09-04 16:42:13 -05:00 |
|
Felipe Cecagno
|
e8dc780c37
|
integrated the video playback into master, but the whiteboard events playback, as well as the presentation playback, is not functional yet - it seems that the writing.js is broken on master, tried to fix it without success
|
2012-08-01 17:40:58 -03:00 |
|