Commit Graph

3079 Commits

Author SHA1 Message Date
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
Richard Alam
adc52a459c - record deskshare stream by setting property 2011-03-12 19:29:06 -05:00
Richard Alam
027e8e8f9b - record video camera by setting property 2011-03-12 19:28:09 -05:00
Felipe Cecagno
bcbb108536 some other improvements on the resize window feature. still blinking sometimes 2011-03-10 18:13:54 +00:00
Marco Calderon
d225ff4d44 Merge remote branch 'mconf/master' 2011-03-10 10:03:15 +00:00
Fred Dixon
e1d9783db7 Recompiled bbb-deskshare-applet-0.71.jar with JDK 1.5 to work on Mac OS 10.5.6 under Firefox 2011-03-07 20:45:00 -05:00
Marco Calderon
e9c996be77 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-03-07 11:03:26 +00:00
Jeremy Thomerson
47126f4622 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into preupload_docs_beta 2011-03-22 18:15:20 -04:00
Felipe Cecagno
d15f6b270c some other improvements on the resize window feature. still blinking sometimes 2011-03-07 09:13:31 +00:00
Felipe Cecagno
1c389f01d3 resolutions are configurated by the config.xml; removed the close button from PublishWindow; implemented the maximize and restore; corrected the implementation of resizing; the implementation of maximize, restore and resize is exactly the same for both PublishWindow and VideoWindow 2011-03-07 09:13:31 +00:00
Marco Calderon
01a5490421 added korean and update dutch locale 2011-03-07 03:45:42 +00:00
Fred Dixon
16873c0683 Fixed #671: Prevent users from entering the demo meeting with empty username 2011-03-16 15:57:42 -04:00
Marco Calderon
0b82f712eb - [ignore] deleting wrong files 2011-03-06 07:40:35 +00:00
Marco Calderon
5a58b9ba11 - added indonesian and portuguese (brazil) locales 2011-03-06 07:35:59 +00:00
@deniszgonjanin
465b8e4922 Issue with non presenter muting in Classroom Audio Module 2011-03-05 15:41:15 -05:00
@deniszgonjanin
e99a3f9335 Modifications to how the microphone is set up in the Class Audio Module 2011-03-05 11:53:04 -05:00
@deniszgonjanin
cdebb92dc6 Another attempted fix at the mute/unmute problem with the Classroom Audio Module 2011-03-05 11:44:04 -05:00
@deniszgonjanin
451f5edd28 Fixed a bug with some viewers coming in unmuted. Class Audio Module 2011-03-05 11:36:34 -05:00
@deniszgonjanin
415da72005 Seems it's hard to completely mute the microphone in flex, so trying to detach the mic from the audio stream. 2011-03-05 11:27:49 -05:00
@deniszgonjanin
c8cafe7ccb Fixed a problem with fully muting people in the Class Audio Module 2011-03-05 11:23:10 -05:00
@deniszgonjanin
e7768ae0dc Added a small API to allow better alignment control of the buttons on the top toolbar. 2011-03-05 11:09:49 -05:00
@deniszgonjanin
52cf24593d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-03-05 10:22:57 -05:00
@deniszgonjanin
f7d3b5437b Minor regression error 2011-03-05 10:22:35 -05:00
deniszgonjanin
a77827ee16 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-03-05 15:20:54 +00:00
deniszgonjanin
20ab541cf4 New task for client's build.xml to allow for building a single module only, to save time when developing from outside Flash Builder 2011-03-05 15:20:13 +00:00