Commit Graph

3153 Commits

Author SHA1 Message Date
Richard Alam
120275071e - now DI works fine...had to delete bin and target dirs remnants from maven build 2011-06-15 17:28:31 -04:00
Richard Alam
58b51c9146 - remove spring integration....having problem with dependency injection 2011-06-15 16:57:06 -04:00
Marco Calderon
f1a55ba26b bigbluebutton-apps handles the presentation messages using gson
TODO: cleanup, logs, and some updates
2011-06-15 01:42:56 +00:00
Marco Calderon
04dff406e8 Merge branch 'ref-bbb-web-2' of github.com:bigbluebutton/bigbluebutton into ref-bbb-web-2
Conflicts:
	bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
2011-06-14 01:47:32 +00:00
Marco Calderon
e858828162 added gson and publish updates in bbb-web, missing receiving code in bbb-apps 2011-06-14 01:43:55 +00:00
Richard Alam
769470e232 - remove jms messages 2011-06-10 15:29:11 -04:00
Marco Calderon
2ac6aaa09a merge remove-bbb-commons, working prototype, need to add status method to listener 2011-06-09 01:35:24 +00:00
Richard Alam
c3b0e376c5 Merge branch 'master' into ref-bbb-web-2
Conflicts:
	bigbluebutton-web/src/java/org/bigbluebutton/api/RedisDispatcherImp.java
2011-06-02 16:40:36 -04:00
Markos Calderon
105f13cc9a Edited bigbluebutton-web/web-app/demo/demo6.jsp via GitHub 2011-06-02 08:47:29 -07:00
Markos Calderon
196a9ccc2c fix demo6 2011-06-02 08:39:57 -07:00
Richard Alam
53ecbf53ba - cleanup
- just store meeting info into metadata redis key
2011-06-02 11:31:52 -04:00
Localization Server
8fc6955c08 Updating locale 2011-06-02 04:00:02 +00:00
Localization Server
79b156ec0a Updating locale 2011-06-02 02:20:02 +00:00
Richard Alam
134be90359 - handle incoming messages from bbb-apps 2011-06-01 17:58:55 -04:00
Richard Alam
fc8905ba67 Merge branch 'master' into ref-bbb-web-2 2011-06-01 14:17:20 -04:00
Richard Alam
50dac08e11 - cleanup sign out api 2011-06-01 14:16:35 -04:00
Richard Alam
c6626c7a9a - write test for get meetings api 2011-06-01 12:42:50 -04:00
Richard Alam
ed1bf9d4f6 - implement test for get meeting info 2011-06-01 12:10:33 -04:00
Richard Alam
8d63e0a717 - continue refactoring bbb-web, renamed a few classes, and change get-meetings-info api 2011-06-01 10:51:40 -04:00
Marco Calderon
1b8011fdce Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-06-01 05:31:12 +00:00
Richard Alam
92cc564d48 - change playback client url 2011-06-01 18:55:25 -04:00
Richard Alam
6d82190ba5 - paddings must be even 2011-06-01 18:27:27 -04:00
Richard Alam
d142763b58 - use pad_top/bottom/left/right options for ffmpeg that comes with Ubuntu 10.04 2011-06-01 18:16:50 -04:00
Richard Alam
de9f45bee9 - add meeting metadata 2011-06-01 18:07:57 -04:00
Fred Dixon
2ca6b2a541 support one slide presentation 2011-06-01 14:52:07 -07:00
Fred Dixon
614e66b0aa Added entry to bigbluebutton.nginx to include rules in /etc/bigbluebutton/nginx for playback clients 2011-06-01 14:49:55 -07:00
Fred Dixon
2b8a054db8 Added simple.nginx to store in /etc/bigbluebutton/nginx to support multiple rewrite rules for nginx 2011-06-01 14:42:48 -07:00
Fred Dixon
05d33be6f1 Minor change to path for simple recordings 2011-06-01 14:00:21 -07:00
Localization Server
708c3201e0 Adding the mongolian locale 2011-06-01 15:46:54 +00:00
Marco Calderon
65c020fac0 demo recording page 2011-06-01 05:30:17 +00:00
Richard Alam
46a769cf2f - add test for end api 2011-06-01 02:47:01 +00:00
Richard Alam
c114289042 - add test for isMeetingRunning api 2011-05-31 17:51:07 -04:00
Richard Alam
282199e668 - publish simple recordings in /var/bigbluebutton/recordings/published/simple 2011-05-31 17:28:20 -04:00
Richard Alam
e3ef2e5f6f - add isMeetingRunning test 2011-05-31 16:59:04 -04:00
Richard Alam
bc1d9ef562 - add back to groovy jar file back as it broke spring integration 2011-05-31 16:32:23 -04:00
Richard Alam
6f9563b190 - put some steps into own methods 2011-05-31 16:10:31 -04:00
Richard Alam
78adae0696 - join and create api have unit tests 2011-05-31 15:23:44 -04:00
Fred Dixon
e82f5c21d1 updates to freeswitch/conf for 0.8 2011-05-31 15:11:30 -04:00
Richard Alam
c40976dab5 - generate default voice conf numbers if none has been passed in the param. 2011-05-31 10:05:09 -04:00
Localization Server
958f0dfcff Updating locale 2011-05-31 03:20:02 +00:00
Localization Server
d6f5b03fe2 Updating locale 2011-05-31 02:00:01 +00:00
Richard Alam
26f98fe879 - write test for create api 2011-05-30 17:39:03 -04:00
Richard Alam
cfe20900f2 - now has setup for testing 2011-05-30 16:26:11 -04:00
Richard Alam
335fd9591d - start refactoring bbb-web again...without trying to merge remove-bbb-commons branch 2011-05-30 01:42:50 +00:00
Richard Alam
4745b0e381 - run pubsub listener on own thread 2011-05-29 03:24:39 +00:00
Richard Alam
01669ce4d7 - move api controller test to another package 2011-05-29 02:33:37 +00:00
Richard Alam
db6f7b49f3 - put all redis classes into Messaging Service
- wee need to be able to mock the messaging service to make it unit testable
2011-05-29 02:32:13 +00:00
Richard Alam
ad9a4895b8 - cleanup jars 2011-05-28 17:57:09 +00:00
Richard Alam
82a1f96cac Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-05-27 19:45:23 -04:00
Richard Alam
6208587706 - update SystemTimer to 1.2.3 2011-05-27 19:45:05 -04:00