Richard Alam
920b21323e
- set session timeout to 3 hours
2010-10-06 10:20:15 -04:00
Richard Alam
0c8977dfde
Merge branch 'master' into merging-fs-support
...
Conflicts:
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PublicScheduledSessionController.groovy
2010-07-20 16:28:59 -04:00
BigBlueButton
333dd13d6b
- fixed few issues and cleaned up
2010-07-19 20:23:28 +00:00
BigBlueButton
ea156fe61e
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2010-07-19 19:45:52 +00:00
BigBlueButton
cad05a9ce1
- bbb-scheduling has been removed from bbb-web
2010-07-19 19:27:24 +00:00
BigBlueButton
1e6eff084b
- Removed bbb-web scheduler
...
- Merged the enter and signout function into the api controller
2010-07-19 19:15:01 +00:00
Richard Alam
af873d63e8
- ignore bbb_conf_api.jsp as it's dynamically generated
2010-07-19 11:32:29 -04:00
Richard Alam
790e42dc86
Merge branch 'ljackson-master' into merging-fs-support
...
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/main/managers/ModuleManager.as
2010-07-16 15:23:22 -04:00
Richard Alam
0e3286667b
- change the api version to 0.7
2010-07-14 16:36:08 -04:00
Leif Jackson
8528b2d287
Merge commit 'bbb/master'
2010-07-14 02:53:29 +00:00
Richard Alam
ec256e7cb7
- upgrading versions from 0.64 to 0.7
2010-07-13 09:42:13 -04:00
Richard Alam
8968fb3593
- ignore bbb_conf_api.jsp
2010-07-12 16:21:06 -04:00
Richard Alam
ac92ed3756
- remove linefeeds
2010-07-12 16:05:31 -04:00
Richard Alam
0fb463a7c2
- put in a working demo1.jsp
2010-07-12 15:48:18 -04:00
Sebastian
5a27c0ebc3
Fixed a bug
2010-07-12 14:01:46 -04:00
Sebastian
a2124651e8
Fixed linefeeds in demo1.jsp
2010-07-12 12:23:14 -04:00
Leif Jackson
f236dc5c1c
Merge commit 'bbb/master' sync with bbb
2010-07-11 04:28:39 +00:00
Sebastian
da9f036339
Removed a space character in demo_footer.jsp
2010-07-02 14:15:30 -04:00
Sebastian
f1d41fd991
Fixed a bug in demo_footer.jsp
2010-07-02 10:19:57 -04:00
Sebastian
b9a514199e
fixed a patch in bigbluebutton.properties
2010-07-02 10:00:12 -04:00
Sebastian
3c8333f8c1
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
...
Conflicts:
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
2010-06-30 15:21:22 -04:00
Sebastian
a35ac1d846
Updated bigbluebutton.properties
2010-06-30 15:20:02 -04:00
Richard Alam
1b2e7b1dc5
- merge in sebs changes
...
Conflicts:
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
2010-06-29 13:37:17 -04:00
Richard Alam
7042903b4b
- remove loggedOutUrl value to easily easily maintain post-install script
2010-06-29 13:31:30 -04:00
Sebastian
552eb9edea
removed the comment from bigbluebutton.properties and removed the link to redirect the server to www.bigbluebutton.org
2010-06-29 13:27:48 -04:00
Sebastian
adcff2c058
Updated the url in demo_footer.jsp
2010-06-29 13:24:53 -04:00
Leif Jackson
e67070cac5
Stability issues with module loader in flex client and deskshare/vm-build.sh script for local devel
2010-06-29 05:07:00 +00:00
Leif Jackson
9decad03c6
Inital import of freeswitch intergration
2010-06-29 04:51:31 +00:00
Richard Alam
f62eb0ae68
- removing bootstrapping of old web interface
2010-06-22 15:46:57 -04:00
Richard Alam
18ff5a0930
- moving the webVoiceConf param into join API
2010-06-22 14:41:28 -04:00
Richard Alam
ab9caa1616
- add webVoiceConf API so third parties can pass in different extension fo voip
2010-06-22 11:24:22 -04:00
BigBlueButton
07f6264e5c
fixes #393 by returning the supplied user ID in the getMeetingInfo call
2010-05-31 17:13:36 +00:00
BigBlueButton
e4fd72681a
- adding .gitignore
2010-05-30 03:55:46 +00:00
Richard Alam
400f90b9f2
- pass in correct password
2010-05-27 15:09:38 -04:00
Richard Alam
56ee75fcc2
- urlEncode meetingID to calculate checksum properly
2010-05-27 14:56:56 -04:00
Richard Alam
b88482dfd2
- fix test to use new bbb-api that includes command into checksum
2010-05-27 10:56:36 -04:00
Omar Shammas
019a05578b
Enabled the Activity Monitor (Demo 4) to end a meeting - This feature is off, to turn on uncomment line 115 in demo4.js
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4349 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-21 18:19:03 +00:00
Omar Shammas
8678bcf116
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4332 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-17 14:00:29 +00:00
Richard Alam
ef93c3ec1c
- add meetingID and externUserID to session
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4325 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-14 19:25:10 +00:00
Jeremy Thomerson
34c802ef27
update issue 528
...
add a version number to response if you call /bigbluebutton/api with no parameters.
this does not require a checksum since the checksum generation differs between certain versions
we still need to change the build process to update the version in bigbluebutton.properties for each built version
i'll leave this part to Fred. I'd suggest using the following versioning process:
0.7-SNAPSHOT - for builds between releases
0.7-final - for release build versions
Owner: ffdixon
Status: Started
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4322 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-14 17:40:17 +00:00
Omar Shammas
4d0fb66801
Fixed demo API
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4321 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-14 15:52:56 +00:00
Jeremy Thomerson
f3fa0f5da2
addition to issue #394 - now adds a response parameter that indicates whether the meeting has been forcibly ended
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4311 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-12 19:30:01 +00:00
Jeremy Thomerson
6e77a17fdc
fixes issue #394 - now does not allow you to rejoin a conference that was already ended
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4309 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-12 19:08:07 +00:00
Jeremy Thomerson
b3be60e2df
addition to issue #473 - make meetingID required parameter to create call
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4308 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-12 19:00:00 +00:00
Jeremy Thomerson
08242fb324
fixes issue #473
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4305 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-12 18:44:22 +00:00
Jeremy Thomerson
24b7dcad60
fixes issue #487
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4304 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-12 18:19:47 +00:00
Jeremy Thomerson
814df400bb
fixes issue #510
...
assign a random password if none is supplied. this is what the API spec has always said would happen, but for some reason, it wasn't happening
now it does. note that if you have any kind of requirements that your passwords must be numeric, a certain length, etc, you really need to pass them in yourself
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4276 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-08 02:14:47 +00:00
Jeremy Thomerson
be9314d6cf
fixes issue #247
...
automatically cleans out conferences that have either:
1 - been created, but not started in XX minutes
2 - or, started, and were ended at least XX minutes ago
you can set the number of XX minutes in bigbluebutton-web bigbluebutton.properties like:
beans.dynamicConferenceService.minutesElapsedBeforeMeetingExpiration=60
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4275 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-08 01:43:22 +00:00
Jeremy Thomerson
c737c7e7f8
add a script to each module that allows me to build / run in dev mode on my vm without having to remember which method I have to build this module in
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4272 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-07 21:53:52 +00:00
Xie Yan Qing
0b740cf948
Set character encoding to UTF-8 in demo pages to support Asian characters.
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4238 af16638f-c34d-0410-8cfa-b39d5352b314
2010-05-04 01:14:40 +00:00