Commit Graph

3161 Commits

Author SHA1 Message Date
Richard Alam
2b34a0eae1 - upgrade FS ESL jar to 0.8.1 with changes for recording events 2011-05-03 17:35:19 -04:00
Richard Alam
be757afc87 - add link to thin doc 2011-05-03 17:31:52 -04:00
Richard Alam
e0452bb372 - cleanup 2011-05-03 17:31:27 -04:00
Richard Alam
e7bbf63484 Merge branch 'master' into record-and-playback-feature
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
2011-05-03 14:50:37 -04:00
Richard Alam
381d89b5d0 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
Conflicts:
	bigbluebutton-client/.actionScriptProperties
	bigbluebutton-client/.flexProperties
2011-05-03 14:47:15 -04:00
Richard Alam
74b8d98fe6 - cleanup 2011-05-03 11:53:38 -04:00
Richard Alam
9863ecf45a - cleanup unneeded dirs 2011-05-03 11:51:56 -04:00
Richard Alam
6dc0a0aa89 - move the matterhorn webapp 2011-05-03 11:50:05 -04:00
Richard Alam
5c1815504d - cleanup 2011-05-03 10:33:40 -04:00
Marco Calderon
f72fed1566 added bundle.setup and metadata to sinatra app 2011-04-29 09:10:59 +00:00
Richard Alam
6dd49331dc - script to concatenate deskshare 2011-04-29 16:50:24 -04:00
Richard Alam
948ade0773 Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2011-04-29 12:36:37 -04:00
Marco Calderon
ffa2a48d21 fixing proxy pass for the matterhorn sinatra app 2011-04-28 23:20:23 +00:00
Marco Calderon
48029bf469 update thin instructions and layout 2011-04-28 20:28:33 +00:00
Markos Calderon
7271288d45 Merged pull request #5 from gugat/rapf.
Matterhorn 1.1 installation steps
2011-04-27 14:00:58 -07:00
Gustavo Salazar
5eaee6af6c Add Matterhorn1.1 installation steps 2011-04-27 00:51:24 +00:00
Richard Alam
c90e9ae19a - add way to do logging 2011-04-26 16:38:10 -04:00
Richard Alam
d244105867 - create cucumber step to test video processing 2011-04-26 12:11:53 -04:00
Richard Alam
2b665ecb50 - add presentation processing 2011-04-26 12:04:52 -04:00
Richard Alam
4250187721 Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2011-04-25 17:04:41 -04:00
Richard Alam
58f51268a7 - process video and presentation 2011-04-25 17:04:10 -04:00
Richard Alam
02b5c9f773 - add logger 2011-04-25 15:29:33 -04:00
Richard Alam
dd66bd9d1a Merge branch 'record-and-playback-feature' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2011-04-25 14:10:00 -04:00
Richard Alam
4ed3cda5d8 - fix paths so we can run the script without failing on "require"
should run scripts in the script dir (i.e. script> ruby archive/master.rb)
2011-04-25 14:06:32 -04:00
Richard Alam
a30e0b0926 - add Process.wait so that external commands are processed sequentially 2011-04-24 22:12:50 +00:00
Richard Alam
8c99450dda - process video recording for matterhorn 2011-04-24 21:44:19 +00:00
deniszgonjanin
5e41c46ea6 Added Settings Module to build.xml 2011-04-22 23:05:08 +00:00
deniszgonjanin
fa6f72c137 Settings Panel will automatically appear at startup when visiting BBB for the fist time. 2011-04-22 22:56:13 +00:00
deniszgonjanin
2eb68cab20 Localization strings for the Settings Panel 2011-04-22 22:48:45 +00:00
deniszgonjanin
cb4508c691 Fixing devbuild breakage 2011-04-22 22:17:49 +00:00
deniszgonjanin
82bece4399 Bug fixes for the Settings Panel 2011-04-22 21:14:34 +00:00
deniszgonjanin
db26b8f5ee More improvements to the Settings Module 2011-04-22 20:14:15 +00:00
deniszgonjanin
44e33cca9d Improvements to the Settings Panel 2011-04-22 20:01:51 +00:00
deniszgonjanin
09e64093b9 Fixed config.xml.template, xml was malformed 2011-04-27 15:55:14 +00:00
deniszgonjanin
f0f3f939e8 Settings Module, initial commit. The Settings Module is based on the BBB-Checklist. It just runs as a BBB module instead, to let the user adjust their settings from within BigBlueButton. 2011-04-27 14:59:13 +00:00
deniszgonjanin
e2b60b7c9c Fixed default language in the language selector to english 2011-04-27 13:32:46 +00:00
BigBlueButton
2433c7fa9b Fixed video resizing bug 2011-04-22 18:44:42 +00:00
Richard Alam
553592b3f1 - change dependencies to be able to run on Red5 1.0 RC
With this change, we will need to package our own Red5 1.0 RC
2011-04-22 12:00:26 -04:00
@deniszgonjanin
8b1f180a1d Serbian (Latin) and Croatian translations 2011-04-21 14:46:21 -04:00
deniszgonjanin
e837658274 Some refactoring of the video window layout code 2011-04-18 20:37:17 +00:00
deniszgonjanin
5c8ae8c9bb Fixes Issue 913 2011-04-18 14:43:10 +00:00
deniszgonjanin
fd79897931 Fixed localization selector bug 2011-04-18 14:30:36 +00:00
@deniszgonjanin
c07478c39e Serbian translation 2011-04-17 17:57:51 -04:00
@deniszgonjanin
3f170220ca I made a noob 2011-04-16 20:23:32 -04:00
deniszgonjanin
86a1797e1f Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-04-16 21:55:06 +00:00
deniszgonjanin
fb93a87d8e Loading of webcam preferences from the settings saved using the bbb-checklist 2011-04-16 21:53:54 +00:00
@deniszgonjanin
431de9a48f Changed size of combo boxes 2011-04-16 15:26:24 -04:00
Felipe Cecagno
1abb71da67 Merge branch 'bbb-master' 2011-04-14 13:25:57 +00:00
deniszgonjanin
47c2173113 Locale strings for the logout window 2011-04-12 21:43:00 +00:00
BigBlueButton
4db0ee6cf3 Fixed disconnect bug. 2011-04-12 20:08:31 +00:00