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
Islam El-Ashi
ec64ebe0d1
Changed header titles for demo API
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4100 af16638f-c34d-0410-8cfa-b39d5352b314
2010-04-02 20:15:15 +00:00
Richard Alam
5a3041c2ef
- refer install instructions to wiki
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4090 af16638f-c34d-0410-8cfa-b39d5352b314
2010-04-02 14:56:39 +00:00
Richard Alam
fb167bc7b2
- change repo dir to /home/firstuser/dev/repo
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4077 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-31 14:38:59 +00:00
Richard Alam
34518c19cc
- adding deprecation notice to bbb-web scheduler
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4056 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-29 19:32:01 +00:00
Islam El-Ashi
7109cdd29d
Added 'create your own meeting' to the list of demos
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4041 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-29 14:47:34 +00:00
Richard Alam
873a8c125b
- fix so that we are checking logoutURL properly from properties file
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4033 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-26 20:06:54 +00:00
Richard Alam
9871f9acfa
- rename loggedOutUrl to logoutURL to be consistent with the API
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4032 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-26 15:34:56 +00:00
Islam El-Ashi
a90712b2d2
Renamed demo1 from 'Join a meeting' to 'Join a course' + added header to demo4
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4023 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-25 21:21:03 +00:00
Islam El-Ashi
12334c12e9
Added demo4_helper
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4007 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-24 22:17:55 +00:00
Islam El-Ashi
07ba64c540
Removed demo 4 security restriction + added demo4 javascript
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4006 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-24 22:05:33 +00:00
Islam El-Ashi
98ea9f40a3
moved demo4
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4005 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-24 21:57:27 +00:00
Islam El-Ashi
5cb078e8ab
Added demo 4: activity monitor
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4004 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-24 21:44:56 +00:00
Chris Liu
39088f8c00
Changed some UTF-16 to UTF-8
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3972 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-23 17:19:55 +00:00
Chris Liu
a417446d83
Reversed the UTF-16 changes Richard made.
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3971 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-23 15:46:15 +00:00
Chris Liu
a84993f485
Changed all UTF-16 back to UTF-8
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3969 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-23 14:17:11 +00:00
Chris Liu
f0d49c6478
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3967 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-22 20:42:47 +00:00
Richard Alam
1613c9bd59
- encode xml response to UTF-16. Fixes issue 421
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3966 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-22 20:24:03 +00:00
Chris Liu
6e6d73e6af
Added UTF-16 support.
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3965 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-22 20:22:25 +00:00
Jeremy Thomerson
ceb0f375e3
add getMeetings call that lists all meetings on server
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3932 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-18 19:55:13 +00:00
Jeremy Thomerson
15894cf901
fix stupid typo that i kept forgetting to fix (for oh, like a year)
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3876 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-10 20:59:04 +00:00
Jeremy Thomerson
26248d7f2f
end meeting API call - issue #394
...
forgot to check this in yesterday
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3871 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-10 17:36:49 +00:00
Jeremy Thomerson
ac17421e6c
work on end meeting API call (issue #394 )
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3864 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-09 19:29:59 +00:00
Jeremy Thomerson
f01048df78
getMeetingInfo works when meeting hasn't started
...
references issue #393
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3825 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-08 17:56:13 +00:00
Jeremy Thomerson
b7515facaa
require moderator password for getMeetingInfo call
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3799 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-05 00:47:39 +00:00
Jeremy Thomerson
cef2d9fc2d
complete getMeetingInfo API call
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3797 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-05 00:24:15 +00:00
Jeremy Thomerson
500604eb55
getMeetingInfo API call working
...
now just need to add more information to it
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3796 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-04 23:59:02 +00:00
Jeremy Thomerson
bdb9832e54
work on getMeetingInfo API call
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3795 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-04 22:41:46 +00:00
Jeremy Thomerson
895ff7d53b
spring integration using full-on objects now
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3793 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-04 21:51:43 +00:00
Islam El-Ashi
522a0dd113
Changed include in test_bbb_api
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3792 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-04 20:59:13 +00:00
Islam El-Ashi
a7175ecdef
Decouple presentation module from + included bbb_api_conf in bbb_test_api
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3790 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-04 20:43:11 +00:00
Jeremy Thomerson
dbbace5f0a
adding common messaging jar to classpath
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3785 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-04 17:30:43 +00:00
Richard Alam
4807c2f7f5
- modify local repo to /opt/bigbluebutton/repo so it's more generic and match with Hudson
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3782 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-04 17:16:28 +00:00
Richard Alam
300eafa9d5
- add build.gradle to setup local repo as well as drag in bbb-common-message lib
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3779 af16638f-c34d-0410-8cfa-b39d5352b314
2010-03-04 16:32:52 +00:00
Fred Dixon
70638b6ac9
Fixed syntax error in demo3.jsp
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3723 af16638f-c34d-0410-8cfa-b39d5352b314
2010-02-15 02:11:47 +00:00
Fred Dixon
7acb8859f1
Added banner image to demo API exampes.
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3722 af16638f-c34d-0410-8cfa-b39d5352b314
2010-02-15 00:43:13 +00:00
Fred Dixon
f33123c8a7
Added logoutURL to demo3.jsp so it should return to the demo page, not the server's home page
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3721 af16638f-c34d-0410-8cfa-b39d5352b314
2010-02-15 00:16:55 +00:00
Fred Dixon
152ce11b39
Updated the API demos to show how to create a meeting that requires a password
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3720 af16638f-c34d-0410-8cfa-b39d5352b314
2010-02-14 23:57:13 +00:00
Jeremy Thomerson
491109b741
fixes issue 343
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3707 af16638f-c34d-0410-8cfa-b39d5352b314
2010-02-11 18:03:53 +00:00
Richard Alam
a4c0d6527d
revert back..accidentally put scala nature
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3685 af16638f-c34d-0410-8cfa-b39d5352b314
2010-02-08 20:01:31 +00:00
Richard Alam
7d4a7476b7
update classpath
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3684 af16638f-c34d-0410-8cfa-b39d5352b314
2010-02-08 19:58:28 +00:00
Richard Alam
947b79dc8c
- add a way to configure a test conference room thru the API
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3683 af16638f-c34d-0410-8cfa-b39d5352b314
2010-02-08 19:11:05 +00:00
Richard Alam
8beb3ac42c
- test hook. Point your browser to http://<ip>/bigbluebutton/test/test_bbb.jsp
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3680 af16638f-c34d-0410-8cfa-b39d5352b314
2010-02-08 17:32:36 +00:00
Richard Alam
76e1baa682
- change logoutUrl to logoutURL to be consistent with other param names
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3679 af16638f-c34d-0410-8cfa-b39d5352b314
2010-02-08 16:23:38 +00:00
Richard Alam
1ac73ea743
- ugggh typo
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3601 af16638f-c34d-0410-8cfa-b39d5352b314
2010-02-03 19:02:03 +00:00
Richard Alam
3393f2b98a
- setup a way to trigger a conversion process on the server. This way we'll be able to test and monitor
...
if the conversion process works
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3600 af16638f-c34d-0410-8cfa-b39d5352b314
2010-02-03 18:58:51 +00:00
Richard Alam
9781c2abd2
- add "logoutUrl" as API create param. This allows you to pass a URL where the participant will be brought when she logs out
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3581 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-31 02:29:51 +00:00
Fred Dixon
79fe33c11c
Modified demo3.jsp so invites join as Viewer. This means only the person who created the meeting will be moderator.
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3484 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-24 22:57:56 +00:00
Fred Dixon
2831cd3a5f
Removed the 0.63-beta text from bbb_banner.jpg in bbb-web
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3483 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-24 22:19:42 +00:00
Fred Dixon
46f2c36442
Updating favicon.ico in web interface
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3473 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-24 18:57:52 +00:00
Fred Dixon
900bca4ff9
Minor tweek on welcome message.
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3464 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-24 02:18:26 +00:00
Fred Dixon
6c060e5592
Updated API demos to show use of %%CONFNAME%% in welcome message.
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3463 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-24 02:11:47 +00:00
Fred Dixon
6f81c10801
updating welcome messag in bigbluebutton.properties
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3462 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-24 00:54:41 +00:00
Fred Dixon
17d76eadb8
Minor edits to API demos
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3460 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-23 23:53:11 +00:00
Fred Dixon
e6398a1586
Once character update to trigger update of devbuild.bigbluebutton.org
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3458 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-23 22:28:44 +00:00
Fred Dixon
f04d4c3319
Properly urlencode meetingID in bbb_api.jsp
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3457 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-23 22:17:57 +00:00
Fred Dixon
1fe8bbfafd
Ensure that meetingID is urlencoded in bbb_api.jsp
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3456 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-23 20:13:50 +00:00
Fred Dixon
5fc8093df4
Changed demo2.jsp to use the welcome message parameter
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3455 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-23 19:37:15 +00:00
Fred Dixon
ffd55fd5a1
Cleanup of the API Demos
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3453 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-23 19:19:14 +00:00
Fred Dixon
cbe0c2bde8
update to demo1.jsp to trigger a rebuild of packages
...
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3452 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-23 01:32:31 +00:00