Fred Dixon
24947df9be
For developting bbb-web using the VM, changing run-war to run-app so the developer can get debug messages to the console
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3448 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-22 23:53:40 +00:00
Fred Dixon
585a659e9e
extracted the salt and BigBlueButtonURL into a separate file bbb_api_conf.jsp so its not checked into SVN
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3437 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-22 21:28:45 +00:00
Richard Alam
2efe8ca25d
- allow keyword substitution on welcome message. Now you can have something like
...
<br>Welcome to %%CONFNAME%%.<br><br>Dial: %%DIALNUM%% Conference: %%CONFNUM%% in your
welcome message.
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3435 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-22 20:59:43 +00:00
Richard Alam
451231e8df
- remove space so easy to parse
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3434 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-22 19:44:06 +00:00
Richard Alam
0cf30e3dde
- provide a way to enable/disable old scheduling mechanism
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3432 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-22 19:03:03 +00:00
Richard Alam
3ef4c41d0e
- limit conference numbers from 70000-79999
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3419 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-21 21:43:49 +00:00
Fred Dixon
a3d41e5e8a
Changed message in build.xml for bbb-web to 'grails run-app' to 'grails run-war'
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3389 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-20 23:59:49 +00:00
Chris Liu
3543a7737e
Fixed build.xml for bbb-web
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3370 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-20 18:20:22 +00:00
Richard Alam
99c9822f9f
- test to trigger build
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3364 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-19 22:10:45 +00:00
Richard Alam
8cdf4cd1dd
- remove html tag in welcome message as chat will format it
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3340 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-19 18:10:36 +00:00
Fred Dixon
104ea65352
removing spaces around ' = ' bigbluebutton.properties ... tracking down a bug in the upgrade scripts
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3305 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-14 16:08:06 +00:00
Fred Dixon
c1dd1c4ee1
updates to draft welcome message in chat window
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3247 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-09 06:56:08 +00:00
Richard Alam
80e25349a1
- reformat welcome message
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3243 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-08 15:51:43 +00:00
Richard Alam
1c928d826e
- provide a way to pass a welcome message that gets displayed on the chat when a participant joins the web conference
...
- the message can be set on bigbluebutton.properties but is better to pass it on the create API as "welcome" variable
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3239 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-07 22:22:58 +00:00
Richard Alam
db5cc1c8f1
- setup fonts directory
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3237 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-07 19:41:03 +00:00
Richard Alam
4e545a737d
- add option to pdf2swf for AMV2 support and fonts directory. THis way we can hightlight text on the
...
resulting slides
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3235 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-07 19:06:47 +00:00
Richard Alam
25e2104eee
- cleanup
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3232 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-07 17:41:03 +00:00
Richard Alam
a65559fa96
- fix logging when deployed to tomcat
...
1. use our own log4j.properties file instead of having grails auto-generate one
2. modify web.xml template to use spring's log4config listener instead of grail's one
3. remove duplicate slf4j library
4. leave log4j DSL in Config.groovy to enable logging when developing and running "grails run-war"
5. log is written to /var/log/bigbluebutton/bbb-web.log
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3231 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-07 17:29:12 +00:00
Richard Alam
f7dd241bbb
- pass conference name or meetingID when a user joins so we can display on the client.
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3200 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-04 17:39:00 +00:00
Richard Alam
dcea25fe5d
- fix AGI to query dynamic conference service if conference is not found from database.
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3199 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-04 16:22:53 +00:00
Richard Alam
aa565b4d5a
- update doc
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3185 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-02 22:39:35 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
DJP
d1b8867019
Handle OpenOffice Files + TXT files
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3095 af16638f-c34d-0410-8cfa-b39d5352b314
2009-12-14 19:21:32 +00:00
DJP
f95e878278
Get rid of client command line wrapper (jodconverter-cli) for Office2Pdf. Resolved Issue 257
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3028 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-21 11:59:19 +00:00
Fred Dixon
a08f7b4c9b
removed spaces from bigbluebutton.properties to make upgrading packages easier
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3027 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-21 03:34:43 +00:00
DJP
cca2df1789
Fixed indent + Image file support + First shot for error handling + Refactored presentation file handling to support additionnal filetype (+ future)
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3024 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-20 23:49:34 +00:00
DJP
61f38d9645
Fixed indent
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3023 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-20 23:48:15 +00:00
DJP
41f9e5c502
Fixed class name Office2SWF -> Office2Pdf which is more correct
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3022 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-20 23:47:48 +00:00
DJP
a650246a77
Fixed bug when there was only one page in file presentation, no thumbnail was renamed due to filename temp-thumb.png instead of temp-thumb-X.png when multiple files
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3020 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-20 23:39:55 +00:00
Fred Dixon
339d0729b2
enabled openoffice for bigbluebutton.properties in bbb-web. This was to update the bbb-web package for integrating DJP's conversion of office documents into BigBlueButton.
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3010 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-15 00:27:43 +00:00
DJP
5de4b3ef3c
Fixed IOError Popup on upload - break up the backend redirection after file upload to save bandwidth for client
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2993 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-11 01:52:09 +00:00
DJP
4b878746e1
Web service update for Additional filetype support
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2990 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-11 00:43:39 +00:00
Fred Dixon
668948d1c1
updating banner images
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2888 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-08 16:48:39 +00:00
Fred Dixon
ecd0b438f5
updates to bigbluebutton.properties
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2877 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-07 00:08:32 +00:00
Richard Alam
fa360130da
- redirect to default url when logged out url is not defined
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2870 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-06 22:07:11 +00:00
Fred Dixon
a82621798a
updates to bbb_banner.jpg for 0.62
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2851 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-06 01:34:35 +00:00
Fred Dixon
e479bc74c1
updating images in bbb-web
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2850 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-06 01:05:07 +00:00
Fred Dixon
1da79c7bd2
removed build.sh from bbb-web
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2821 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-05 01:18:41 +00:00
Fred Dixon
0d76a4f9bf
setting defult action in build.xml for bbb-web to run
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2809 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-04 03:36:35 +00:00
Fred Dixon
cfbd6c2aa1
updated build.xml for bbb-web to simplify local development
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2803 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-04 00:29:03 +00:00
Fred Dixon
ecba245df4
added support for .grails/bigbluebutton-config.properties in bbb-web when developing locally
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2802 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-03 23:18:34 +00:00
Fred Dixon
6c39a3af70
removed reference to /etc/defaults/bigbluebutton (not used)
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2797 af16638f-c34d-0410-8cfa-b39d5352b314
2009-11-03 20:27:01 +00:00
Fred Dixon
e08dc36316
added run target to bigbluebutton-web/build.xml
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2769 af16638f-c34d-0410-8cfa-b39d5352b314
2009-10-30 20:01:43 +00:00
Fred Dixon
b4b5c5dd37
removed hardcoded path in bigbluebutton-web/grails-app/conf/Config.groovy
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2768 af16638f-c34d-0410-8cfa-b39d5352b314
2009-10-30 19:39:24 +00:00
Richard Alam
3b7bd3676f
- put a logged out url landing page
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2722 af16638f-c34d-0410-8cfa-b39d5352b314
2009-10-27 20:57:40 +00:00
Jeremy Thomerson
83c3927b0a
fix cast which for some reason works under 10 but not over
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2682 af16638f-c34d-0410-8cfa-b39d5352b314
2009-10-15 04:10:52 +00:00
Jeremy Thomerson
c871480f00
support voice bridge in API
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2676 af16638f-c34d-0410-8cfa-b39d5352b314
2009-10-09 05:01:08 +00:00
Jeremy Thomerson
98a02ebec2
fix a couple little things in the API
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2675 af16638f-c34d-0410-8cfa-b39d5352b314
2009-10-09 04:27:42 +00:00
Jeremy Thomerson
e376f2c75e
working conference service - create and join api calls
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2659 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-28 21:56:13 +00:00
Jeremy Thomerson
f0bcd620ad
have prototype of end-to-end JMS messaging for conference events with spring integration
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2657 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-28 21:31:23 +00:00
Richard Alam
2741362a3e
- change voiceBridge to voicebridge so it's compatible with PublicSessionController. THis way we dont' have to change config.xml in the client.
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2647 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 19:43:53 +00:00
Richard Alam
0a9d4ac945
- change voicebridge param so we can support other than 85115
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2633 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 19:13:51 +00:00
Fred Dixon
8e60b76530
updates to demo.html
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2632 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 19:07:44 +00:00
Richard Alam
a45e0cac52
- remove id from url mapping
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2628 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 18:14:18 +00:00
Richard Alam
1e9dd27215
- add boolean transactional false to DynamicConferenceService
...
- change API again
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2627 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 17:41:30 +00:00
Richard Alam
b7064ec12a
- change Adhoc API from POST to GETs
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2620 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 17:16:18 +00:00
Jeremy Thomerson
c29c09f5c3
add isMeetingRunning api call
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2614 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 05:58:31 +00:00
Jeremy Thomerson
596cac75f2
work on join meeting call
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2613 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 05:47:50 +00:00
Jeremy Thomerson
c84d23244d
more work on dynamic conferencing api
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2612 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 05:20:00 +00:00
Jeremy Thomerson
c002986fd1
change url mapping for my api so as not to conflict with richard's and fix bug in create method returning duplicate xml
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2611 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 03:33:24 +00:00
Jeremy Thomerson
4b3102e521
merging my branch into trunk
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2608 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-25 03:00:15 +00:00
Richard Alam
f3c8ee1055
- cleanup, convert println to log
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2601 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-24 18:28:56 +00:00
Richard Alam
7ac215b5c5
- modify adhoc controller so it supports xml, form, and json requests
...
- create a demo on how to call it using jquery
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2600 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-24 18:20:19 +00:00
Richard Alam
2e57f81df1
- fix logging
...
- put logs in /tmp/logs
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2599 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-24 18:13:53 +00:00
Richard Alam
cbeb98c867
- setup demo for creating adhoc conf
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2598 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-23 19:56:44 +00:00
Jeremy Thomerson
c37f52013d
update svn ignore to ignore build artifacts and fix .classpath for groovy 1.6.4
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2589 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-22 22:42:32 +00:00
Richard Alam
a589578751
- upgrade groovy to 1.6.4
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2577 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-22 14:37:52 +00:00
Richard Alam
e3f9a3dba0
- checkin jsecurity 0.4.1
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2576 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-22 14:23:57 +00:00
Richard Alam
ac32baf6bf
- checking in adhoc REST api
...
- moving to jsecurity 0.4.1
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2572 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-21 20:45:55 +00:00
Richard Alam
f76afe580d
- upgrade to grails 1.1.1
...
- upgrade to jsecurity 0.4
- merge portal controller from Jeremy
- start implement adhoc conference api
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2570 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-20 19:19:50 +00:00
Fred Dixon
5fa71b60dc
updates to bbb_banner.jpg
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2479 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-14 09:50:58 +00:00
Richard Alam
d861ee94ca
- add header
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2463 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-11 16:01:51 +00:00
Richard Alam
3b78af5d4f
- send thumbnails message twice...need to figure out why we are loosing messages
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2422 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-10 17:15:29 +00:00
Richard Alam
4e733c1cba
- when resulting swf file is greater than 500K, use an image snapshot to generate the slide
...
- send out generating thumbnails progess update
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2369 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-04 17:58:34 +00:00
Richard Alam
4cc227cd99
- refactor presentation service
...
- generate blank slide or thumbnail if conversion fails for that page
- if the resulting swf file is greater than 500K, generate a SWF file using a PNG snapshot to make resulting SWF file smaller. This helps to improve performance when rendering the slide on the client
Config Changes:
/etc/nginx/sites-available/bigbluebutton
- set client_max_body_size 20m; // Allow 20Mb file upload
- put blank slide and thumbnail in /var/bigbluebutton/blank (see bigbluebutton.properties)
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2356 af16638f-c34d-0410-8cfa-b39d5352b314
2009-09-02 19:42:10 +00:00
Fred Dixon
5f8ccedb04
updates to bbb-web
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2209 af16638f-c34d-0410-8cfa-b39d5352b314
2009-08-12 16:33:07 +00:00
Richard Alam
c1f4214b3a
- change banner
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2206 af16638f-c34d-0410-8cfa-b39d5352b314
2009-08-12 15:50:37 +00:00
Richard Alam
c79ae8b689
- remove number of attendees for now as it's not being used and just confuses users
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2164 af16638f-c34d-0410-8cfa-b39d5352b314
2009-08-11 15:14:14 +00:00
Richard Alam
56aeba1abf
- convert print to log
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2107 af16638f-c34d-0410-8cfa-b39d5352b314
2009-08-05 17:53:19 +00:00
Richard Alam
91302c1ba1
- rename agi name
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2106 af16638f-c34d-0410-8cfa-b39d5352b314
2009-08-05 17:29:06 +00:00
Richard Alam
05ad3510e9
- modify agi script so all it does is query for the conference...the logic is handled in the dialplan
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@2105 af16638f-c34d-0410-8cfa-b39d5352b314
2009-08-05 15:52:36 +00:00
Fred Dixon
419827e430
added LGPL license
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1831 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-30 18:45:42 +00:00
Tyler Copeland
5be57e60da
Update the wording for default session
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1607 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-12 15:31:43 +00:00
Richard Alam
0687899829
- put in license file
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1606 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-12 15:28:59 +00:00
Richard Alam
a2a18a9448
- fix problem when creating a new user
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1601 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-11 19:38:02 +00:00
Tyler Copeland
c1f423e6a9
Updated banner image
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1600 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-11 19:10:36 +00:00
Richard Alam
93bc275683
- fix managing users
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1599 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-11 19:06:09 +00:00
Tyler Copeland
da03e4d201
test commit
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1598 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-11 19:02:04 +00:00
Richard Alam
da762f5164
- fix problem where the client gets loaded even when user enters the wrong password
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1585 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-10 14:49:24 +00:00
Richard Alam
3fc40d425e
- display more info when joining a conference
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1568 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-05 14:46:34 +00:00
Richard Alam
789a61f38e
- display default username and password
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1566 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-04 21:13:23 +00:00
Richard Alam
78b3ab1c3f
- change favicon
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1565 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-04 20:07:59 +00:00
Richard Alam
4b11be9518
- login directly into the client when a user successfully enters a passsword
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1564 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-04 19:36:30 +00:00
Richard Alam
fca9a1fbcc
- remove new schedule link as it should be only accessible from the conference page
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1561 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-03 20:00:35 +00:00
Richard Alam
9997466eee
- comment out record, time scheduling, and host password as we don't use it for now
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1559 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-03 19:42:48 +00:00
Fred Dixon
b692425b3b
small updates to build.sh and streamlined join in preview of new session
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1542 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-03 01:48:29 +00:00
Fred Dixon
782cc2d321
testing commit of a touched file
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1537 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-03 00:24:55 +00:00
Fred Dixon
24a92381e7
remove carriage returns for development on unix
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1535 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-02 22:35:52 +00:00
Fred Dixon
e098260a53
remove carriage returns for development on unix
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1534 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-02 22:35:22 +00:00
Richard Alam
0776a4d2b1
- need to use AGI to get conference number when someone joins the voice conference
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1522 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-02 17:33:50 +00:00
Richard Alam
b69abde8f5
- fix some problem with creating default conference
...
- remove Asterisk AMI/AGI beans from resources.xml as we don't need it for now
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1520 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-02 15:54:16 +00:00
Richard Alam
4aa64ce1b1
- fix NPE problem with scheduling
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1513 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-01 19:31:33 +00:00
Richard Alam
9282339540
- flush right away to database when saving domain in bootstrap
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1510 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-01 15:18:03 +00:00
Fred Dixon
af3461fac4
added build script for Ubuntu
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1508 af16638f-c34d-0410-8cfa-b39d5352b314
2009-06-01 01:57:33 +00:00
Richard Alam
be91497b09
- remove phil and alice from bootstrap
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1504 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-29 21:18:49 +00:00
Fred Dixon
d48a25ec4a
modify text of join screen
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1484 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-29 00:40:35 +00:00
Fred Dixon
9128e11737
modify the shortcut to join a session
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1483 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-29 00:37:51 +00:00
Fred Dixon
3fc60ec0e0
assign default conference to admin user
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1482 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-29 00:35:41 +00:00
Fred Dixon
93a0215443
add shortcut to join session when scheduling it
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1481 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-28 23:32:18 +00:00
Fred Dixon
d54e1038e8
updated bigbluebutton.properties
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1477 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-28 21:43:47 +00:00
Richard Alam
5983047344
- create a default conference and session (85115)
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1465 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-28 15:21:40 +00:00
Richard Alam
2bee4d2ddd
- change logo
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1463 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-27 15:21:52 +00:00
Richard Alam
75f5fc575d
- fix link when showing conference session
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1452 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-21 14:21:37 +00:00
Richard Alam
cfe414e8b3
- Add to to refresh browser
...
- Add "CLICK HERE TO JOIN"
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1425 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-08 20:20:40 +00:00
Richard Alam
ca2059bcf7
- trigger hudson build
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1418 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-08 15:13:14 +00:00
Richard Alam
71a7398ee7
- set version to 0.1
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1417 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-08 15:05:11 +00:00
Richard Alam
4db5c733ee
- put a check in so that it won't check conflicts if there is none
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1416 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-08 14:45:45 +00:00
Richard Alam
eb786d9b89
- change audio recording directory
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1414 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-08 14:21:21 +00:00
Richard Alam
45e1bf2fcb
- remove duration
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1411 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-08 02:58:52 +00:00
Richard Alam
b7fffff463
- preset conference number
...
- use conference number in joining
- check if there is a conflict when scheduling session
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1410 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-08 02:32:56 +00:00
Richard Alam
04260c65ab
- add more logging when in agi
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1409 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-07 13:07:17 +00:00
Richard Alam
b7f3f65079
- log where we are recording the audio file
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1408 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-07 12:52:20 +00:00
Richard Alam
bb3e419e7e
- hardcode /var/spool/asterisk/meetme (recordings dir) for now...can't seem to make it work...
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1407 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-07 12:34:24 +00:00
Richard Alam
3b250897f8
- conferenceRecordingDir seems not to work...hardcore it for now since it probably won't change anyways
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1405 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-06 19:37:00 +00:00
Richard Alam
e80dfc7214
- set conferenceRecordingDir into AsteriskAgiService bean
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1399 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-06 19:15:16 +00:00
Richard Alam
89da6bf5ab
- display bbb-web version
...
- must do "grails set-version xxx" before build
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1392 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-05 18:46:56 +00:00
Richard Alam
372882c568
- set role as MODERATOR when logging in as host as we don't support HOST for now
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1389 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-05 17:47:33 +00:00
Richard Alam
339a8908c6
- set the default end time an hour after start date time
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1371 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-04 21:08:18 +00:00
Richard Alam
56d4f6fbe9
- make the directory where we store the meetme recording into the properties file to make it configurable
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1370 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-04 20:53:27 +00:00
Richard Alam
948e351d3a
- setup recording only when the host asked the session to be recorded
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1369 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-04 15:20:59 +00:00
Richard Alam
832d959dfe
- rename AsteriskAgi to AsteriskAgiService so the logger gets injected by Spring
...
- enable recording of audio conference
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1368 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-04 15:08:38 +00:00
Richard Alam
90d1d82098
- enable AgiService to be called from Asterisk in order to have dynamic voice conferencing
...
- need to add this line to /etc/asterisk/extension.conf
exten => 1300,1,Agi(agi://192.168.0.100/meetme.groovy)
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1367 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-03 20:06:34 +00:00
Richard Alam
7ab8d3cdb4
- fix issue where process hangsup during waitFor() on getNumberOfPages...()
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1362 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-02 16:18:23 +00:00
Richard Alam
f109871e17
- add logging to see if command is executing
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1358 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-01 21:02:15 +00:00
Richard Alam
c0389d1c29
- fix typo in var name
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1357 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-01 20:55:56 +00:00
Richard Alam
e3f158d50e
- need to wait for the pdf2swf to end before checking exitValue in getPageNumber()
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1356 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-01 20:55:10 +00:00
Richard Alam
dc05281d35
- Adding noPdfMarkWorkaround into PresentationService as a workaround for this problem
...
http://groups.google.com/group/comp.lang.postscript/browse_thread/thread/c2e264ca76534ce0?pli=1
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1355 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-01 20:27:03 +00:00
Richard Alam
f64008a003
- add more logging to determine why conversion is failing in Ubuntu
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1354 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-01 20:10:44 +00:00
Richard Alam
34e533ecbd
- replace invalid chars from presentation name and uploaded filename
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1353 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-01 17:56:59 +00:00
Richard Alam
575262dd44
- change name of swftools, imagemagick and ghostscript in properties file to make it clear to the user to enter the directory or executable
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1351 af16638f-c34d-0410-8cfa-b39d5352b314
2009-05-01 16:01:04 +00:00
Richard Alam
c8f37afd0d
- modify to show conference session information before joining
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1346 af16638f-c34d-0410-8cfa-b39d5352b314
2009-04-30 19:12:28 +00:00
Richard Alam
0f35da8582
- add some debug logs and fix links on displaying session info
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1340 af16638f-c34d-0410-8cfa-b39d5352b314
2009-04-29 21:33:15 +00:00
Richard Alam
5a7ca059b3
- put bigbluebutton web server url into properties file
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1339 af16638f-c34d-0410-8cfa-b39d5352b314
2009-04-29 21:09:37 +00:00
Richard Alam
29c99178eb
- merge in branches/developers/ritzalam/bbb-web-playback
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1336 af16638f-c34d-0410-8cfa-b39d5352b314
2009-04-29 19:38:46 +00:00
Richard Alam
8d894ccb24
- put back fix for uploaded files with space on filenames
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1282 af16638f-c34d-0410-8cfa-b39d5352b314
2009-04-18 00:44:12 +00:00
minoustudio
5bd1196edf
20090414: multi-presentation
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1239 af16638f-c34d-0410-8cfa-b39d5352b314
2009-04-14 15:47:33 +00:00
minoustudio
338e094484
20090414: multi-presentation
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1238 af16638f-c34d-0410-8cfa-b39d5352b314
2009-04-14 15:47:16 +00:00
Richard Alam
98dc0bc272
- bringing bigbluebutton-web into trunk
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1190 af16638f-c34d-0410-8cfa-b39d5352b314
2009-04-01 16:53:45 +00:00