Commit Graph

16 Commits

Author SHA1 Message Date
Felipe Cecagno
555e037d79 fix merge and refactor a few pieces to fit better on BigBlueButton 1.0.0 2015-11-30 01:06:38 -02:00
Felipe Cecagno
38e27ecfca Merge branch '090-presentation-export' into mconf-live0.6.2
Conflicts:
	record-and-playback/deploy.sh
2015-01-23 14:50:06 -02:00
Felipe Cecagno
b3daaf72b3 Merge branch 'presentation-export' into 090-presentation-export 2015-01-22 15:58:16 -02:00
Felipe Cecagno
8e12c909c5 Merge branch '090-encrypted-recording' into HEAD
Conflicts:
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	record-and-playback/core/Gemfile
	record-and-playback/deploy.sh
2015-01-21 15:51:29 -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
c1f3b2c5c7 a few tweaks to fit the new rap worker 2014-09-10 17:23:17 -03:00
Felipe Cecagno
f68b0e4a16 cleanup 2014-09-01 17:53:57 -03:00
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
Felipe Cecagno
820001214c improving the rap deployment script 2013-06-17 14:35:23 -03:00
Felipe Cecagno
dc27467490 check if the metadata passed in the create call is empty; raise an exception if the private key isn't found on the recording server; updated the deploy script using the ideas implemented on chef 2013-02-28 16:35:22 -03:00
Felipe Cecagno
5bb65fb5af improved the deploy script so if no parameters are passed, it will act as a recording server; if a text parameter is passed containing "mconf", the encryptor will be deployed 2013-02-08 16:12:27 -02:00
Felipe Cecagno
135c8fc463 updating the record-and-playback deployment script 2013-02-04 16:42:34 -02:00
Felipe Cecagno
8531534bc7 copied the entire record-and-playback module of BigBlueButton master (pre 0.81) to the v0.8 tag; the only file merged is record-and-playback/core/lib/recordandplayback.rb 2013-02-04 15:34:54 -02: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