Commit Graph

3153 Commits

Author SHA1 Message Date
Richard Alam
b01211d8f2 Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature
Conflicts:
	record-and-playback/rap/lib/recordandplayback/collectors/audio.rb
2011-04-04 09:12:08 -04:00
Richard Alam
c5526c1df3 - add video collector 2011-04-04 09:07:59 -04:00
Richard Alam
6237913c44 - match start and stop events 2011-04-04 01:28:29 +00:00
Richard Alam
b93e3d9892 - parse events.xml 2011-04-03 23:19:32 +00:00
Richard Alam
b15b209320 - convert some of the python scripts to ruby 2011-04-02 17:29:04 +00:00
Richard Alam
520040e890 - add collectors for presentation and deskshare...need to be DRYer 2011-04-02 14:16:13 +00:00
Richard Alam
1f0cf9d23e - add video stream collector 2011-04-01 17:27:32 -04:00
Richard Alam
2ba47e1d17 - stub out file actions in audio collect rspec step 2011-04-01 14:01:41 -04:00
Richard Alam
a155a0c6c3 - modify rspec test 2011-03-31 16:13:27 -04:00
Richard Alam
8e7a1836cb - rename archiver_audio.rb to audio_collector.rb 2011-03-31 10:30:01 -04:00
Richard Alam
03eb374938 - copy example resqueu app. We'll use this as the base where we can send record processing jobs. 2011-03-30 17:12:52 -04:00
Richard Alam
adf7ee56fa - add resque gem 2011-03-30 15:45:30 -04:00
Richard Alam
e8f95d9436 - add some raw recordings we can use for unit testing 2011-03-30 14:34:42 -04:00
Richard Alam
a3640e6f87 - add record status events in the client 2011-03-30 14:33:00 -04:00
Marco Calderon
de0b9ed39f Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2011-03-28 02:36:47 +00:00
Marco Calderon
c29dc34e00 added redis support to matterhorn app 2011-03-28 02:35:24 +00:00
Marco Calderon
f30ab7d6b5 matterhorn sinatra app 2011-03-28 00:10:13 +00:00
Marco Calderon
39f10baf17 added bigbluebutton-ruby-api gem 2011-03-27 01:15:19 +00:00
Marco Calderon
49df7affdc update zn_TW locale 2011-03-23 15:42:08 +00:00
Marco Calderon
4af0c95285 update polish locale 2011-03-23 15:07:31 +00:00
Marco Calderon
b11c06abd2 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-03-23 15:00:13 +00:00
@deniszgonjanin
e60bf5aa23 Fixed Issue 882. Also another issue where the whiteboard sometimes goes stupid and draws everything from the top left corner of the screen. 2011-03-29 02:39:56 -04:00
@deniszgonjanin
85ae75ee5f Changed javascript file initialization so they work better in sandbox mode 2011-03-27 21:45:29 -04:00
deniszgonjanin
c0d9b16c91 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-03-27 21:45:55 +00:00
deniszgonjanin
46eb5c7dc7 Cleaned up HTML template of the client. Moved all javascript functionality to external java script files 2011-03-27 21:45:08 +00:00
Marco Calderon
58b0530f17 added ruby script for concat videos 2011-03-23 04:16:00 +00:00
Richard Alam
4e55a6e157 - notify client on the status of deskshare recording
- this should just display alert boxes for now. we need to figure out the best way
   to display record status that will also be used for voice, video, and events (chat, presentation, whiteboard, etc.)
2011-03-29 15:28:59 -04:00
Richard Alam
9785cde147 - remove unneeded class 2011-03-29 10:04:21 -04:00
Richard Alam
1ddb70d528 - fix so that deskshare start and stop events are stored properly in Redis and the ingest/proc scripts is able to retrieve the events 2011-03-29 10:03:21 -04:00
Richard Alam
190c4eb794 - record desktop sharing events to redis 2011-03-28 11:43:06 -04:00
Richard Alam
f39dbd4f11 - implement recording listeners for desktop sharing 2011-03-26 15:50:19 -04:00
Richard Alam
0d3ff179d9 - cleanup FlvStreamToFile.java 2011-03-25 17:06:42 -04:00
Richard Alam
0468104a43 - cleanup
- add checks to recording directory to make sure that it has been created with proper permissions
2011-03-25 11:58:20 -04:00
Richard Alam
1800cc3681 - setup testng for deskshare server app
- add config file for deskshare app and make recording directory configurable
 - add build dir to .gitignore
2011-03-23 15:38:32 -04:00
Richard Alam
17422c3007 - can't really ignore a file that has been tracked by git. The way to ignore changes to a file is to
git update-index --assume-unchanged src/main/webapp/WEB-INF/bigbluebutton.properties
   which temporarily untracks the file. And then when you want to track again, do
       git update-index --no-assume-unchanged src/main/webapp/WEB-INF/bigbluebutton.properties
2011-03-23 13:59:51 -04:00
Richard Alam
303920e3c5 - create default bigbluebutton.properties and add to .gitignore. This way, developers
can customize to match there dev environment and won't checkin their settings
2011-03-23 12:51:23 -04:00
Richard Alam
bc4be2b7bf - add jedis dependency
- change copyToLib task to resolveDeps so it's consistent with the other subsystems
2011-03-22 10:43:31 -04:00
Richard Alam
92c0af9f49 - remove LIVE|RECORD mode as we are not using it 2011-03-22 10:23:32 -04:00
Richard Alam
775d7fff3c - cleanup 2011-03-22 10:22:44 -04:00
Richard Alam
2798f4db2b - can't get redis pool working...connect each time for now 2011-03-22 10:19:53 -04:00
Richard Alam
a1d983f204 - disable redis pubsub 2011-03-22 10:19:16 -04:00
Richard Alam
46f8b07ae6 - setup testng tests framework 2011-03-18 16:20:14 -04:00
Richard Alam
9c6b27fb5f Merge branch 'master' into record-and-playback-feature
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
2011-03-18 15:43:39 -04:00
Richard Alam
d697d9d6cc - record deskshare 2011-03-18 15:35:10 -04:00
Richard Alam
bc293a33f5 - move the tests into proper directory so that gradle can find it 2011-03-18 15:33:16 -04:00
Richard Alam
efb8a84892 - make "gradle test" run the tests 2011-03-18 15:31:09 -04:00
Richard Alam
ab2f359a53 - format video stream name into <meetingid>-<userid>-<timestamp> so that we can easily
identify and parse the video recordings
2011-03-15 15:36:32 -04:00
Richard Alam
52817279a2 - add streams directory for video and deskshare apps where we store recordings 2011-03-15 15:30:29 -04:00
Richard Alam
bcb88f4bb6 - add timestamp on recorded flv filename so that we can handle multiple recordings in a meeting 2011-03-15 15:21:09 -04:00
Felipe Cecagno
6f76f07b42 starting to implement the window layouts - the small videos layout is fully implemented 2011-03-15 16:24:41 +00:00