Commit Graph

1526 Commits

Author SHA1 Message Date
Fred Dixon
93e2578f2c updates to api demos
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3160 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-30 20:11:08 +00:00
Richard Alam
cdd1d9a0cf - can now convert upload image files (JPG and PNG)
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3159 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-30 19:13:50 +00:00
Fred Dixon
0ab10f6112 removed login.jsp from demos
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3158 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-30 18:53:47 +00:00
Fred Dixon
ef272047a7 change login.jsp to bbb_api.jsp for resetting IP address
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3157 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-30 18:53:16 +00:00
Fred Dixon
782444b325 More work in the API examples
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3156 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-30 18:36:20 +00:00
Richard Alam
0369d208db - can now handle office documents
- cleanup

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3155 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-30 17:17:45 +00:00
Richard Alam
310e330b97 - can now handle PDF
- need to figure out why office doc throws SI exception

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3154 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-29 20:29:17 +00:00
Richard Alam
7e2a0b5b2e - checking in so we don't loose anything if something crashes
- refactor uploaded presentation conversion
- write some unit tests
- add headers

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3153 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-28 19:38:08 +00:00
Fred Dixon
363e24cb31 changes to demo3.jsp and login.jsp to get the URLs correct
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3148 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-24 03:38:34 +00:00
Fred Dixon
4ee66efe4b minor update to trigger build
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3147 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-24 03:27:27 +00:00
Fred Dixon
6ec166dd9c Changed bbb-conf -d to now look for errors in /var/log/bigbluebutton/* and bbb-conf --setip to update API demo /var/lib/tomcat6/webapps/bigbluebutton/demo/login.jsp
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3146 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-24 03:02:55 +00:00
Fred Dixon
fa81684cc0 Have bbb-web log to /var/www/bigbluebutton; add JSON support for reply when calling create() in ApiController.groovy
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3145 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-24 02:21:26 +00:00
Fred Dixon
e73b2ea920 updates bigbluebutton.properties to support securitySalt for API
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3144 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-24 02:05:45 +00:00
Fred Dixon
5a814a86b0 Adding examples to show how to use the BigBlueButton API from JSP pages
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3143 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-24 02:01:26 +00:00
Tyler Copeland
a649a2a434 new upload presentation icon
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3142 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-23 21:23:57 +00:00
Tyler Copeland
9f05ea1219 updated upload icon
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3141 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-23 21:14:20 +00:00
Tyler Copeland
bf2a02a4ba updated digrams
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3137 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-23 20:57:47 +00:00
Denis Zgonjanin
84673a13b6 Fixed some of the issues with zooming in the new presentation
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3136 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-22 23:12:17 +00:00
Denis Zgonjanin
2d223ac582 Fixed PresentationWindow not closing after user clicks logout
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3135 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-22 22:25:05 +00:00
Denis Zgonjanin
986df177aa Minor changes to config.xml to work with desk share
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3134 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-22 21:49:38 +00:00
Denis Zgonjanin
e25455a697 Commented out desktop sharing on config.xml
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3133 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-22 21:20:37 +00:00
Richard Alam
eeaeb5bb61 - refactor presentation classes from groovy to java...java has better tool support for eclipse
- start extracting out some code from PresentationService into it's own classes

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3132 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-22 21:06:23 +00:00
Richard Alam
8e3bb94f1d - remove the filename ext...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3131 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-22 21:02:00 +00:00
Denis Zgonjanin
88911803ba Fixed several client issues for 0.63
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3130 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-22 20:15:58 +00:00
Richard Alam
20214d33ee - activate desktop sharing when assigning presenter (fixes http://code.google.com/p/bigbluebutton/issues/detail?id=282)
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3129 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-20 16:25:36 +00:00
Fred Dixon
bc69bb79d7 bbb-conf -d now checks for errors in /var/log/syslog
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3128 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-19 23:33:29 +00:00
Fred Dixon
b7e2223bb5 testing automatic updates on hudson
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3127 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-19 18:01:09 +00:00
Fred Dixon
807fb63dfe testing automatic updates on hudson
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3126 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-19 17:58:59 +00:00
Fred Dixon
8fa891c208 testing automatic updates to devbuild.bigbluebutton.org
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3125 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-19 17:37:29 +00:00
DJP
6476da212a Test devbuild + Try failed so rolling back...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3124 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-19 17:14:30 +00:00
DJP
c747165947 Test devbuild + try to fix a bug...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3123 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-19 16:35:26 +00:00
Fred Dixon
ffca2f54d3 testing automatic updates to devbuild.bigbluebutton.org
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3122 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-19 16:25:57 +00:00
Fred Dixon
c532bcdd0d testing automatic updates to devbuild.bigbluebutton.org
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3121 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-19 16:21:03 +00:00
Fred Dixon
a1a291b693 testing automatic updates to devbuild.bigbluebutton.org
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3120 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-19 16:17:11 +00:00
Fred Dixon
0fea536b29 testing automatic updates to devbuild.bigbluebutton.org
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3119 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-19 16:12:42 +00:00
Fred Dixon
8efefc3277 testing automatic updates to devbuild.bigbluebutton.org
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3118 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-19 16:08:33 +00:00
Fred Dixon
9d204cb3ce testing automatic updates to devbuild.bigbluebutton.org
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3117 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-19 15:58:52 +00:00
DJP
60e7ff87bb Forgot to add new support extension format to regexp the presentationName + added more space to see presentationName on UI
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3116 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-17 23:54:45 +00:00
DJP
860ee6fc0d Fixed issue 275 which in fact was caused by presentationName
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3115 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-17 23:51:57 +00:00
DJP
6d14ff08db presentation file error handling : new message code depending on specific error
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3114 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-17 23:08:17 +00:00
DJP
0d68343fa9 presentation file error handling : handle more error case
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3113 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-17 23:07:33 +00:00
DJP
ba48dba7ac New i18n messages for new presenttion module error handling
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3112 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-17 23:06:49 +00:00
DJP
5190321157 Fixed indent + better error handling
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3111 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-17 23:06:09 +00:00
Fred Dixon
1940316690 tweak of bbb_banner.png
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3108 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-15 22:51:30 +00:00
DJP
e0ff381156 Added error handling on presentation module to be compatible with i18n string generation by Flash client
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3107 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-15 20:45:42 +00:00
DJP
58cbfe3c1a Added error handling on presnetation module to be compatible with i18n string generation by Flash client + fixed indent
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3106 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-15 20:44:53 +00:00
DJP
2eb7e81c3d Added error handling to be compatible with i18n string generation by Flash client
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3105 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-15 20:42:39 +00:00
Fred Dixon
31717efed5 updated banner to show 0.63 - Beta
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3104 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-15 20:11:18 +00:00
Fred Dixon
1d283c8efd updated banner to show 0.63 - Beta
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3103 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-15 20:07:00 +00:00
Richard Alam
f970b70513 - rename classes
- modify so that to set which app to use, you need to only modify bigbluebutton.properties
by setting asterisk.application=konference or asterisk.application=meetme

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3102 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-15 17:38:28 +00:00