Commit Graph

1349 Commits

Author SHA1 Message Date
Richard Alam
1727582cd8 - fix so that securitySalt can be set in the properties file
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3184 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-02 22:38:51 +00:00
Richard Alam
a27195c7e1 - handle presentation messages
- cleanup

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3183 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-02 18:59:34 +00:00
Richard Alam
c018114366 - modify how thread get created on doc conversion
- make max number of pages allowed to be configurable thru the properties file

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3182 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-02 18:57:30 +00:00
Fred Dixon
9b8cab2351 added robots.txt to root web directory
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3181 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-02 16:45:17 +00:00
Fred Dixon
76a8174c27 bbb-conf: better monitoring of resources when using bbb-conf -w
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3180 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-02 02:17:11 +00:00
Fred Dixon
9bae69959c Updated demo3.jsp -- worked around a bug in IE8 that was preventing the user from automatically joining the meeting
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3179 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-01 23:08:21 +00:00
Fred Dixon
52797c536a Minor updates to main index.html page
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3178 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-31 23:12:58 +00:00
Fred Dixon
1ccad22c5c More formatting updates to API demos
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3177 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-31 22:17:06 +00:00
Fred Dixon
69a76857f6 Minor updates to main index.html page
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3176 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-31 22:16:30 +00:00
Fred Dixon
9c233d5c40 formatting updates to api demos
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3175 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-31 21:55:44 +00:00
Fred Dixon
4dc7bc5824 formatting updates to api demos
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3174 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-31 21:48:15 +00:00
Fred Dixon
c250ae59c1 Added back favicon.ico :-)
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3173 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-31 21:34:53 +00:00
Fred Dixon
8c989b344e Updates to BigBlueButton landing page
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3172 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-31 21:29:39 +00:00
Fred Dixon
6852e2d3a4 Updates to BigBlueButton landing page
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3171 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-31 21:29:33 +00:00
Fred Dixon
291ea27074 Modified demo3.jsp to currently work without asterisk being able to confirm the dynamically created room.
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3169 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-31 21:07:22 +00:00
Richard Alam
34fbff77d1 - handle new message from bbb-web and send to client
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3168 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-31 19:47:05 +00:00
Richard Alam
dc06beef06 - receive new messages
- need to handle the other messages properly (Failure scenarios)
- need to clean-up

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3167 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-31 19:43:55 +00:00
Richard Alam
c74577871a - change messages sent to client during conversion
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3166 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-31 19:39:14 +00:00
Fred Dixon
689624afdd Got demo3.jsp working with spaces in usernames
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3165 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-30 22:53:57 +00:00
Fred Dixon
e9fc475dc8 demo3.jsp now asks for name before attempting to join a meeting.
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3164 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-30 21:29:08 +00:00
Fred Dixon
12b2e6ce8f updates to demo3 (create a meeting)
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3163 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-30 21:09:59 +00:00
Fred Dixon
cab724fdc8 bbb-conf now correctly updates /var/lib/tomcat6/webapps/bigbluebutton/demo/bbb_api.jsp when using --setip
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3162 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-30 20:53:15 +00:00
Fred Dixon
50f0f91e5e checking that upgrades work
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3161 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-30 20:34:00 +00:00
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