Commit Graph

142 Commits

Author SHA1 Message Date
Richard Alam
bc6c392da3 - formatting changes 2011-05-27 11:36:50 -04:00
Marco Calderon
0fdb2d4875 some changes in bbb-web and bbb-apps for pubsub 2011-02-22 17:13:00 +00:00
Richard Alam
d0184c8210 - cleaning up bbb-web 2011-01-19 11:09:50 -05:00
Marco Calderon
e9c120dc9f voice recording for freeswitch 2011-01-12 18:10:50 +00:00
Marco Calderon
f37093d533 update demo filesfor support recording 2011-01-10 12:08:54 +00:00
Richard Alam
18b46ba729 - change conf num to start with 7 as that's what we have in the dialplan 2010-11-09 08:24:09 -05: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
Richard Alam
af873d63e8 - ignore bbb_conf_api.jsp as it's dynamically generated 2010-07-19 11:32:29 -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
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
adcff2c058 Updated the url in demo_footer.jsp 2010-06-29 13:24:53 -04: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
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
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
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
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
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
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
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
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
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
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
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
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
Fred Dixon
f25115381b Adding error handling to demo[1,2,3].jsp pages
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3451 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-23 01:22:23 +00:00
Fred Dixon
6382edf74e added back @import for bbb_api_conf.jsp to bbb_api.jsp
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3449 af16638f-c34d-0410-8cfa-b39d5352b314
2010-01-23 00:08:52 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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