BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,540 Commits 13 Branches 260 Tags 1.1 GiB
6ec1272a2b
Commit Graph

1972 Commits

Author SHA1 Message Date
tylercopeland
499aba5f03 css style updates 2013-10-29 19:01:52 -04:00
mohamed-ahmed
1c012aec32 merged html5-bridge with master 2013-10-29 18:33:25 +00:00
Richard Alam
a141928824 - Fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1671 
Remove the beginning . (dot) from uploaded presentation.
 2013-10-23 16:21:49 +00:00
Fred Dixon
ca56259457 Updating label to RC4 2013-10-20 15:47:12 -04:00
Felipe Cecagno
0cf35712cf added <voiceBridge> and <dialNumber> on create and getMeetings call 2013-10-14 11:48:39 -03:00
Felipe Cecagno
8e2ac7335b Merging tag v0.81RC3 into audio-video-on-api 2013-10-14 10:58:57 -03:00
Felipe Cecagno
6f0323e1fb many refactoring in the current code, bbb-apps and bbb-web now agree about the participants status, but there's still work to do - the lock layout button, for instance, is not disappearing if I change the participant's role to viewer 2013-10-14 01:02:51 -03:00
Richard Alam
12a4df7dcf Merge branch 'master' into refactor-voice-users 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
 2013-10-11 20:58:35 +00:00
Fred Dixon
381ddbf3a9 Updated labels for 0.81-RC3 2013-10-09 14:05:55 -04:00
Richard Alam
5bb5f2000d Merge branch 'master' into new-polling-feature 2013-10-07 15:16:25 +00:00
mohamed-ahmed
9c0e4ca9dd Merge branch 'master' into throwaway-merge 2013-10-03 16:07:28 +00:00
Felipe Cecagno
9a2c605866 Merge branch 'master' into multicamera-0.81 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
 2013-09-29 21:19:29 -03:00
Fred Dixon
6b7438e9f8 Updated wording of welcomeMessageFooter 2013-09-27 19:01:59 -04:00
Richard Alam
d8ae699a36 - update gradle build 2013-09-27 17:43:32 +00:00
mohamed-ahmed
ad86f142d4 merged Gary's newUI and fixed conflicts 2013-09-27 16:07:38 +00:00
Fred Dixon
a84c6ca8e8 Configuration updates for moving to 0.81-RC2 2013-09-26 16:42:27 -04:00
Gary Deng
fb8af3bdf7 implement html5 new interface 2013-09-24 06:13:09 -07:00
Ubuntu
be264746b8 Merge branch 'new-polling-feature' into redis-backed-bbb-live-data 2013-09-11 19:18:01 +00:00
mohamed-ahmed
7a50b35873 added 'move_and_zoom' event to pubsub 2013-09-10 20:54:49 +00:00
Richard Alam
d402f7b333 Merge branch 'master' 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
 2013-09-09 18:42:21 +00:00
Nadia Noori
c2c344ed79 Changing lable to RC1 2013-09-04 14:24:19 -04:00
Felipe Cecagno
f8e63fd6f4 Merge branch 'master' into mconf-branding 
Conflicts:
	bigbluebutton-client/build.xml
	bigbluebutton-client/locale/ar_SY/bbbResources.properties
	bigbluebutton-client/locale/az_AZ/bbbResources.properties
	bigbluebutton-client/locale/bg_BG/bbbResources.properties
	bigbluebutton-client/locale/ca_ES/bbbResources.properties
	bigbluebutton-client/locale/cs_CZ/bbbResources.properties
	bigbluebutton-client/locale/da_DK/bbbResources.properties
	bigbluebutton-client/locale/de_DE/bbbResources.properties
	bigbluebutton-client/locale/el_GR/bbbResources.properties
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/es_ES/bbbResources.properties
	bigbluebutton-client/locale/es_LA/bbbResources.properties
	bigbluebutton-client/locale/et_EE/bbbResources.properties
	bigbluebutton-client/locale/eu_EU/bbbResources.properties
	bigbluebutton-client/locale/fa_IR/bbbResources.properties
	bigbluebutton-client/locale/fi_FI/bbbResources.properties
	bigbluebutton-client/locale/fr_CA/bbbResources.properties
	bigbluebutton-client/locale/fr_FR/bbbResources.properties
	bigbluebutton-client/locale/he_IL/bbbResources.properties
	bigbluebutton-client/locale/hr_HR/bbbResources.properties
	bigbluebutton-client/locale/hu_HU/bbbResources.properties
	bigbluebutton-client/locale/id_ID/bbbResources.properties
	bigbluebutton-client/locale/it_IT/bbbResources.properties
	bigbluebutton-client/locale/ja_JP/bbbResources.properties
	bigbluebutton-client/locale/kk_KZ/bbbResources.properties
	bigbluebutton-client/locale/km_KH/bbbResources.properties
	bigbluebutton-client/locale/ko_KR/bbbResources.properties
	bigbluebutton-client/locale/lt_LT/bbbResources.properties
	bigbluebutton-client/locale/lv_LV/bbbResources.properties
	bigbluebutton-client/locale/mn_MN/bbbResources.properties
	bigbluebutton-client/locale/ne_NE/bbbResources.properties
	bigbluebutton-client/locale/nl_NL/bbbResources.properties
	bigbluebutton-client/locale/no_NO/bbbResources.properties
	bigbluebutton-client/locale/pl_PL/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/locale/pt_PT/bbbResources.properties
	bigbluebutton-client/locale/ro_RO/bbbResources.properties
	bigbluebutton-client/locale/ru_RU/bbbResources.properties
	bigbluebutton-client/locale/si_LK/bbbResources.properties
	bigbluebutton-client/locale/sk_SK/bbbResources.properties
	bigbluebutton-client/locale/sr_RS/bbbResources.properties
	bigbluebutton-client/locale/sv_SE/bbbResources.properties
	bigbluebutton-client/locale/th_TH/bbbResources.properties
	bigbluebutton-client/locale/tr_TR/bbbResources.properties
	bigbluebutton-client/locale/uk_UA/bbbResources.properties
	bigbluebutton-client/locale/vi_VN/bbbResources.properties
	bigbluebutton-client/locale/zh_CN/bbbResources.properties
	bigbluebutton-client/locale/zh_TW/bbbResources.properties
	bigbluebutton-client/resources/prod/MconfLive.html
	bigbluebutton-client/resources/prod/lib/bbb_blinker.js
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
	record-and-playback/presentation/playback/presentation/playback.html
 2013-08-26 21:26:44 -03:00
Felipe Cecagno
65163c49ef Merge branch 'master' into guest-role-0.81 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/events/LogoutEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
 2013-08-26 15:13:38 -03:00
mohamed-ahmed
2951a3bbd8 slide size hotfix 2013-08-26 14:32:19 +00:00
mohamed-ahmed
995359a9d4 merged latest with my local changes 2013-08-14 16:48:54 +00:00
mohamed-ahmed
2df93fa993 modified local settings to be able to run on my system 2013-08-02 20:48:31 +00:00
Jorge Nunez
5b1d62f5d2 Merge remote branch 'upstream/master' into html5-bridge 
Conflicts:
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2013-07-31 17:27:33 -07:00
Hugo Lazzari
c358fe33d8 Merge branch 'master' into get-recordings-metadata-filter-0.81 2013-07-31 09:20:40 -03:00
Hugo Lazzari
1d99f3ed30 Bugfix: Missed method included, still need to fix bug on client that crash. 2013-07-25 11:48:20 -03:00
Hugo Lazzari
a91a2df678 Merge branch 'master' into guest-role-0.81 
Conflicts:
	bbb-api-demo/src/main/webapp/demo3.jsp
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonSession.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/User.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/BBBUser.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/UsersConnectionEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
	bigbluebutton-web/application.properties
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2013-07-24 11:25:36 -03:00
Markos Calderon
1df0a4c4ba fix for precreated poll 2013-07-17 18:46:32 -05:00
Richard Alam
34a9875766 - enable webhooks 2013-07-11 19:20:11 +00:00
Richard Alam
14d3b615bc - handle prescreated polls and display them in client 2013-07-10 20:56:32 +00:00
Richard Alam
7d3e5afb5f - remove re-encoding of posted XML data as grails 1.3.9 doesn't unencode automatically the data 2013-07-10 19:14:25 +00:00
Richard Alam
c6611f6f4e - have bbb-web send create/destroy meeting to red5 2013-07-09 20:52:57 +00:00
Markos Calderon
5a09b5a6d2 adding a response when server is down 2013-06-25 18:26:49 -05:00
Markos Calderon
78074528c8 BBB filter 2013-06-25 13:29:28 -05:00
Markos Calderon
f520bef467 mark bbb-apss down if server doesn't respond back 2013-06-24 17:33:39 -05:00
Markos Calderon
b327e16e56 sending and handling keepalive messages 2013-06-21 20:38:14 -05:00
Fred Dixon
1c7d220edc Updated welcome message footer to 0.81-beta-2 2013-06-18 05:17:24 -07:00
Richard Alam
4fc7a40faf Merge remote branch 'origin/polling-module' into make-users-user-conn-invoke 2013-06-17 19:12:23 +00:00
Richard Alam
0536939bc7 synching up with master 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/present/maps/PresentEventMap.mxml
 2013-06-17 18:32:09 +00:00
Fred Dixon
70f26a27f2 Minor updates to welcome message 2013-06-16 07:19:32 -07:00
Markos Calderon
dfbfae9c8d change reject value when the meeting doesn't exist 2013-07-10 16:12:08 -05:00
Markos Calderon
ff893f36fe Fix: disallow client to reconnect by refreshing the browser, when a meeting ends 2013-07-10 16:01:54 -05:00
Markos Calderon
d730300c8a fix sending full meetingID 2013-06-12 18:59:32 -05:00
Markos Calderon
2597d47bba listen to events in bbb-callbacks 2013-06-12 18:49:32 -05:00
Markos Calderon
f20f243b05 Correction to subscription API calls 2013-06-11 18:38:28 -05:00
Markos Calderon
51279ec549 API calls for subscribing to events 2013-06-10 18:38:35 -05:00
Markos Calderon
8ca16a3953 updating bbb-apps to handle polls 2013-06-06 18:53:57 -05:00
Ricahrd Alam
695bb54ab5 - have upgrade to grails 1.3.9 work 
- remove plugins tomcat, hibernate, jsecurity
    grails --list-plugins
    grails --uninstall-plugin hibernate
    grails --uninstall-plugin jsecurity
    grails --uninstall-plugin tomcat
 2013-06-06 12:49:18 -07:00
Richard Alam
e1879795e9 try to upgrade to grails 1.3.9 - Not starting properly though 2013-06-06 12:17:52 -07:00
Markos Calderon
7f748fd809 reading polls from create API call 2013-06-05 17:56:03 -05:00
Markos Calderon
47eadc0fe5 Adding poll models 2013-06-04 19:13:54 -05:00
Calvin Walton
085294af6d Fix typo 'defaulLayout' in join parameters 2013-05-30 17:47:26 -04:00
Richard Alam
11f41b8d70 Revert " - allow removing of close button for avatar and publish window through config.xml" 
This reverts commit 961626f46a.
 2013-05-28 16:24:54 +00:00
Richard Alam
961626f46a - allow removing of close button for avatar and publish window through config.xml 2013-05-28 16:18:48 +00:00
Richard Alam
af0c56c131 updating api version to 0.81 2013-05-25 16:31:33 -03:00
Richard Alam
b28cb66f32 - change how we create the base string and calculate checksum for setConfigXML API 2013-05-24 15:11:36 +00:00
Mohamed Ahmed
bf441450b0 modified ip and salt to that of my system 2013-05-23 11:54:23 -04:00
Richard Alam
be8befb243 Merge branch 'master' into html5-bridge 
Conflicts:
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
 2013-05-09 17:25:25 +00:00
Richard Alam
4d3e6de0e9 - return the default config xml without wrapping in a response xml. THis way, the config xml isn;t encoded. 2013-04-28 21:52:14 +00:00
Richard Alam
5cdf1b18f6 - sign the query string for get default config xml 2013-04-17 21:59:51 +00:00
Richard Alam
18bacaa632 - fix NPE when sending incorrect checksum to getDefaultConfigXML call 2013-04-17 18:43:10 +00:00
Fred Dixon
abc074aaa1 Hide the network monitor and editing buttons for layouts module by defult 2013-04-16 19:23:20 -07:00
Markos Calderon
fca07405e0 fixing some configurations 2013-04-10 14:53:45 -05:00
Dale Karp
0813595c61 fixed merges 2013-04-10 17:23:40 +00:00
Jesus Federico
36ed2f6537 Made error messages consistent on setConfigXML 2013-04-05 00:07:41 -04:00
Richard Alam
e35071a050 - add API to allow querying for default config.xml 2013-03-27 18:21:54 +00:00
Richard Alam
27af71f208 - handle passing of config xml 2013-03-27 16:06:03 +00:00
Richard Alam
d9bbc14d80 - remove decoding of config xml to utf-8...I still think we need to encode 
the config xml to utf-8 and decode it
 2013-03-22 15:32:44 +00:00
Richard Alam
8c157a3914 - handle setConfigXML 2013-03-21 17:14:13 +00:00
Richard Alam
0e386adab2 Merge branch 'master' into merge-master-into-dynamic-config 2013-03-15 21:03:13 +00:00
jfederico
f56c4474e6 bigbluebutton-web: Added a footer to welcome message. A disclaimer or copyright signature can be placed here for all the meetings in a server. 2013-03-13 15:01:14 -04:00
Dale Karp
7f03043f78 updated local props file 2013-03-07 17:59:36 +00:00
Felipe Cecagno
fca92eef96 only includes the playback or download tags on getRecordings response if the formats aren't empty 2013-02-22 22:22:28 -03:00
Felipe Cecagno
f8180d3cee very first implementation of the getRecordings call filtering by metadata; the idea is the same as on create, the user will specify some parameters as meta_*, and the call will return just the recordings that match all the metadata specified; it continues working with the meetingID filter, and both can be used together 2013-02-22 17:44:24 -03:00
Markos Calderon
3003280227 Added voicebridge and dialnumber to ExternalApiCalls 2013-02-22 15:37:59 -05:00
Dale Karp
b1a14c98c6 commiting changes made to run env 2013-02-21 17:11:23 +00:00
Markos Calderon
cc1e40d61c Added user customdata to the client 2013-02-19 12:18:12 -05:00
Markos Calderon
1929526a4d added custom data parameter when a user joins to a meeting 2013-02-14 15:59:52 -05:00
Richard Alam
e6fe97db36 Merge branch 'master' into merge-master-into-dynamic-config 2013-02-07 18:53:01 +00:00
Felipe Cecagno
08e07fb049 cleaning up 2013-02-04 15:23:50 -02:00
Gilson Souza
891e12b815 including the field key into API getRecordings 2013-02-04 13:34:07 -02:00
Gilson Souza
7fc5db4b21 changing API to add the new object download into the getrecordings XML reply 2013-02-04 13:34:05 -02:00
Markos Calderon
ba2da7004c Merge almost complete. Still red dot not working 2013-01-25 21:50:32 -05:00
Markos Calderon
740123942d a fix when the name param is not passed in the API 2013-01-23 16:43:06 -05:00
Markos Calderon
f93d40adfe Added property for set max swf file size 2013-01-23 16:01:01 -05:00
Markos Calderon
983f93b0e4 Added license for bigbluebutton-web 2013-01-18 18:24:35 -05:00
Richard Alam
5a95875968 - hash the meeting id with the config xml 2012-12-10 19:05:41 +00:00
Richard Alam
02c6121a6c - rename set and get configxml api 2012-12-09 20:44:52 +00:00
Richard Alam
a70d56ff56 - tie tokens to a meeting 2012-12-09 20:35:09 +00:00
Richard Alam
a0d4c61082 - add ability to post config xml for meeting 2012-12-09 19:29:48 +00:00
Richard Alam
1f620583a2 - allow passing of configURL in create and join api calls 2012-12-09 00:23:33 +00:00
Richard Alam
7ea06bd512 - add defaultAvatarURL property 2012-12-04 19:09:03 +00:00
Richard Alam
1cd682e1e0 - pass avatar in avatarURL during join API call. Have a default avatarURL 2012-12-02 10:57:58 +00:00
Richard Alam
787e1de310 - pass external meeting id to the client and provide JS api to query it 2012-11-20 19:30:08 +00:00
Richard Alam
e63bbfc449 - pass defaultLayout in join api call 2012-11-12 21:05:23 +00:00
jfederico
93b1bbda72 bbb-lti 0.1: Added functionality for passing IMS Global Certification test 
Signed-off-by: jfederico <jesus@123it.ca>
 2012-10-24 16:04:40 -04:00
Markos Calderon
4d76c61417 added a better quality for converting images 2012-10-24 14:37:25 -05:00
Felipe Cecagno
604d08937c refactoring some code to revert unwanted changes; extracted strings from GuestWindow; renamed the join parameter from isGuest to guest 2012-10-24 17:32:59 -02:00
Markos Calderon
faeac6a6e1 move and back slides 2012-10-23 13:32:59 -05:00
Markos Calderon
9e45420a4c load presentation in both sides html5 and flex 2012-10-20 14:18:39 -05:00
Felipe Cecagno
b0ae2252ea Update bigbluebutton-web/grails-app/conf/bigbluebutton.properties 
Reverted the default server URL on bbb-web
 2012-10-03 15:37:27 -03:00
Hugo Lazzari
f52117cb03 Add new page with forced favicon. 2012-10-03 10:54:56 -03:00
Richard Alam
2c6b067b01 - convert userid from Number to String 2012-10-02 17:23:15 +00:00
Markos Calderon
5dafac2b25 change long to string 2012-10-01 16:41:33 -05:00
Hugo Lazzari
d9aff81560 New Guest - Now guest isn't a role. You can be a moderator and guest at the time. 2012-09-26 13:14:03 -03:00
Markos Calderon
23a03c21e7 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into html5-bridge 2012-09-24 14:27:31 -05:00
Markos Calderon
c878ff5d06 added redirect and clientURL parameters to the API 2012-09-21 16:03:53 -05:00
Markos Calderon
ce9d7c1706 API stores meeting in redis, apps stores users in redis 2012-09-14 16:48:05 -07:00
Prav-Hugo
8e29964f6a Feature #389 Creation of "guest" role on BigBlueButton 2012-09-12 12:35:06 -03:00
Richard Alam
d9e5c80c6c - try generating userid instead of using red5 connection id as userid 2012-08-23 19:49:31 +00:00
Richard Alam
0be1db0cc9 - fix merge edit problem 2012-08-17 14:42:30 +00:00
Chad Pilkey
cfd3446123 Merge remote branch 'upstream/master' 
Conflicts:
	README
	bigbluebutton-client/.gitignore
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2012-08-07 19:56:23 +00:00
Richard Alam
cbe0ee60cc - merge some new stuff 
Conflicts:
	bigbluebutton-web/.gitignore
 2012-07-29 16:06:39 +00:00
Chad Pilkey
17acf9c6df hooked up presentation text 2012-07-24 20:36:29 +00:00
Markos Calderon
3c7419c5ef load textfile from the client 2012-07-17 16:39:32 -07:00
Richard Alam
a8e80c3a9c - make it compile 2012-07-16 19:03:12 +00:00
Ajay Gopinath
27b2e5ad10 Finalized licenses and deleted random backup files and cleaned up repo. 2012-07-15 14:49:42 -04:00
Markos Calderon
3d0b3f9307 added extract text from presentations 2012-07-12 15:49:33 -07:00
Markos Calderon
9fed546de9 Initial changes for extract text 2012-07-11 15:37:31 -07:00
Ajay Gopinath
715cb602c3 Finished text tool 'options'. 2012-07-09 16:43:03 -04:00
Ajay Gopinath
8715327475 Modified record event to include fill color. Need to finish text tool and presentation GUI. 2012-07-08 14:30:46 -04:00
Ajay Gopinath
a9fabf0028 Fixed duplication of GraphicObjects glitch when zooming and changing view modes. Added sprite transformation libraries but need to integrate with program. 2012-07-06 15:40:35 -04:00
Ajay Gopinath
b2e86495c6 Added selection tool and basic recognition of individual objects. Need to fix text tool and allow modification of individual objects. 2012-07-05 16:03:17 -04:00
Ajay Gopinath
938103972d Finished basis for text tool. Stil need to add identification for individual objects/add text customization/fix glitches. 2012-07-04 12:28:29 -04:00
Ajay Gopinath
1f759c1466 Backup commit before resetting dev env 2012-06-27 18:28:01 -04:00
Leonardo Crauss Daronco
1f4c32cef3 Added <listenerCount> and <videoCount> to the response of 'getMeetings'. 2012-05-25 14:19:15 -03:00
Markos Calderon
0b63acb6bc Update bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java 2012-04-19 14:08:52 -05:00
Markos Calderon
6183dab2c5 a better way to support old date format 2012-04-14 13:47:31 -07:00
Markos Calderon
1720b4bdda Adding support for old date format 2012-04-14 11:20:01 -07:00
Leonardo Crauss Daronco
6a5c39d012 Added <participantCount> to the reponse of getMeetings. 2012-04-03 12:04:29 -03:00
Richard Alam
5177a1737a - allow admin to turn off recording for whole server 2012-03-29 16:26:10 +00:00
Markos Calderon
c4d866419c change date format in getRecordings for bigbluebutton 0.8 2012-03-26 13:47:35 -07:00
Richard Alam
d8274e0920 - send the number of slide completed instead of page number 2012-03-09 22:17:43 +00:00
Richard Alam
8527f3fe1b - remove cancelling of task as we have put timouts already in the external proc calls 2012-03-08 17:22:01 +00:00
Richard Alam
ea087125db - increase max pages for uploaded presentation 2012-03-08 17:21:35 +00:00
Richard Alam
bab14dc466 - add a timeout when executing external process to prevent doc convertion from hanging in case 
external command goes wrong
 2012-03-08 16:52:17 +00:00
Richard Alam
c331f9aaaf log received message from redis pubsub 2012-03-08 16:46:37 +00:00
Richard Alam
dafc3deb96 - create blank thumbnails for pages that failed to generate one 2012-03-07 17:28:18 +00:00
Richard Alam
6e73b5ee16 - improve logging for doc conversion 2012-03-07 16:24:44 +00:00
Richard Alam
197e07e289 - remove logging as it's too much 2012-03-07 16:23:06 +00:00
Markos Calderon
64b27f2ebe fix end meeting 2012-03-05 15:26:13 -08:00
Markos Calderon
cd584ba6ef fix for end meeting 2012-02-23 16:18:40 -08:00
Markos Calderon
59071bcb52 fix for end meeting request 2012-02-16 12:51:57 -08:00
Leonardo Crauss Daronco
f6f744cf5e Removed the tag <isListener> from getMeetingInfo and added a tag <listenerCount>. 
This is a simpler solution that doesn't require matching a voice conference user with a "normal" user.
 2012-02-16 13:48:26 -02:00
Leonardo Crauss Daronco
1d848b1aaa Added "isListener" to the response of "getMeetingInfo". Had to change bbb-apps, bbb-web and bbb-client to generate and detect events when the user starts/stops its audio. The method used in bbb-client to send the externalUserId can still be improved. 2012-02-16 14:14:23 +00:00
Leonardo Crauss Daronco
8da1535c28 Adding internalMeetingID, isPresenter, hasVideoStream, and videoStreamName to the response of getMeetingInfo. 2012-02-09 12:33:03 -02:00
Richard Alam
a73287ea29 - store logout url into a session to make sure we get a logour url for a user 2012-02-01 23:04:12 +00:00
Richard Alam
742fd24b2d - redirect to landing page when user refresh the browser and there is no session 2012-02-01 22:11:36 +00:00
Richard Alam
bc54a34736 - test if storing user info in hashmap will cleanup on tomcat6 restarts...on tomcat6 restarts, sessions 
aren't destroyed which allows users to join the meeting by just refreshing the browser which screws up
   bbb-apps state
 2012-02-01 20:51:43 +00:00
Richard Alam
456042f74c - add logging when trying to join session...investigating why we are allowed to refresh 
browser and join conference after restart of BBB
 2012-02-01 19:05:52 +00:00
Markos Calderon
d2c317c900 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-01-27 12:22:16 -08:00
Markos Calderon
01a90feab5 improvement for generate thumbnails 2012-01-27 12:21:48 -08:00
Markos Calderon
17097c26f7 Merge pull request #23 from gugat/issue1112 
In Api upload, strip any extension from the presentation directory
 2012-01-26 10:37:12 -08:00
Fred Dixon
f997391899 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-01-19 21:22:55 -05:00
Fred Dixon
6bcb73e014 Set 
removeMeetingWhenEnded=true

as default in bigbluebutton.properties.  This will reduce errors with 3rd party integrations when users end a meeting, change a parameter, then try
start the meeting again.
 2012-01-19 21:21:19 -05:00
Richard Alam
ecc979e274 - generate internal userid to be able to match users across subsytems 2012-01-18 15:46:29 +00:00
Fred Dixon
20d4587e3e Changed API welcome messages from 'use a headset to avoide echo' to 'you can mute yourself in the listeners window' (BigBlueButton 0.8 now uses Flash for acoustic echo cancellation) 2012-01-15 12:32:39 -05:00
Fred Dixon
bf254501f5 Changed bbb-web to using a rolling 20 days of logs 2012-01-15 12:31:14 -05:00
Fred Dixon
b66059168d increased the size of bbb-web.log to 25M and keep six rolling files (instead of three) 2012-01-15 12:05:21 -05:00
Markos Calderon
f82633fc75 adding logs to pubsub updates 2012-01-11 13:31:45 -08:00
Markos Calderon
e4ed4b868a fix end time when someone rejoins to a meeting 2012-01-11 13:17:09 -08:00
gugat
eba253fa04 In Api upload strip any extension from the presentation directory 2012-01-11 14:34:16 -05:00
Richard Alam
9c8aeae213 - if there are no pre-uploaded presentation passed through the api, pre-upload a default presentation 2012-01-10 16:25:46 +00:00
Richard Alam
180d1acc58 - Make defaultLogoutUrl not blank so that bbb-conf --check does not complain 2012-01-09 23:23:44 +00:00
Markos Calderon
ea5331d0c9 now, bbb-web uses the internalUserId 2012-01-09 14:44:14 -08:00
Markos Calderon
2ad5c4365b fix to handle exceptions the updates of the API 2012-01-09 10:20:57 -08:00
gugat
1beac318f9 Meeting stays created infinitely when defaultMeetingCreateJoinDuration=0 
Solves issue 1097
 2011-12-18 11:46:09 -05:00
Markos Calderon
e84a27c51c added config file for jedispool 2011-12-12 15:18:52 -08:00
Markos Calderon
c2b0f1588f fix urlencode in pre upload 2011-11-11 09:23:30 -08:00
Richard Alam
c5043a9f1d - fix the name properly as there are 60000 millis in a minute 2011-10-24 22:07:18 +00:00
Richard Alam
b52f5ae158 make it return the same response as 0.71a (fix isse 1027 http://code.google.com/p/bigbluebutton/issues/detail?id=1027) 2011-10-02 23:24:00 -04:00
Marco Calderon
d91607b1d8 changes to the length 2011-09-28 12:37:26 -05:00
Marco Calderon
6b7cdd3528 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-09-26 11:38:01 -05:00
Marco Calderon
a5a2fd67e0 a try-catch for compability with the old recordings 2011-09-26 11:36:46 -05:00
Richard Alam
f60023e7c9 Make meeting name optional to not break Moodle 1.9 integration 2011-09-23 19:15:59 -04:00
Marco Calderon
3425db56e7 added voicebridge to getMeetingInfo 2011-09-23 11:04:14 -05:00
Marco Calderon
261707478b fixed recording time 2011-09-22 12:50:35 -05:00
Richard Alam
1164bb3e8f - setup logout url when user enters instead of when user leaves because when the user clicks on the OK button 
on the logout window after one minute, the meeting is gone from bbb-web memory.
 2011-09-13 14:34:36 -04:00
Fred Dixon
9e93cc7b86 Removed depreciated message (we can look at this post 0.8) 2011-09-08 17:25:19 -07:00
Marco Calderon
c36951dca6 updated messaging module in bbb-apps 2011-09-08 12:11:34 -05:00
Marco Calderon
6a47157b22 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-09-06 12:47:35 -05:00
Marco Calderon
b80e4ea5a1 Added CDATA to getRecordings 2011-09-06 12:46:54 -05:00
Richard Alam
ed44841a4c - handle only pre-upload on first create API call 2011-09-06 11:48:38 -04:00
Fred Dixon
f4bc50a179 Modified default welcome message to give a bit more help to first time users. 2011-09-04 15:48:51 -07:00
Fred Dixon
b5f0464c46 Removed old API demos from bigbluebutton-web ... they are now moved to bbb-api-demo 2011-09-04 08:00:08 -07:00
Richard Alam
b9de9180eb - remove interface dec to fix bbb-web build breakage 2011-09-02 09:56:45 -04:00
Marco Calderon
ff575071d9 fix metadata values 2011-09-01 19:46:29 -05:00
Marco Calderon
6e41cae223 some fixes in the api 2011-08-31 17:22:10 +00:00
Marco Calderon
2db74d4d06 small fix for invalid password 2011-08-24 19:39:57 +00:00
Marco Calderon
deae7b0d15 fix for errors in api 2011-08-24 16:27:37 +00:00
Marco Calderon
dbd04839ec added backward compatibility for errors 2011-08-23 19:19:25 +00:00
Marco Calderon
5e457b71d1 initial backward compability for 0.71a 2011-08-23 02:46:37 +00:00
Richard Alam
160b037570 - the meeting has not actually ended when a user is in the meeting. Our logic removes the meeting when 
everyone leaves and a user rejoins the meeting within 1 minute.
 2011-08-22 15:12:34 -04:00
Richard Alam
ea76262a7c - add more logging to figure out why we are ending the meeting pre-maturely 2011-08-22 13:36:10 -04:00
Marco Calderon
4d734506f4 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-08-17 15:41:43 +00:00
Richard Alam
7089da4f16 - Add more logs to figure out why we are cleaning meeting pre-maturely 
- Don't process recording for meeting that we are cleaning because no one joined it.
 2011-08-19 11:27:00 -04:00
Richard Alam
d591cbc07f - remove meeting if nobody joined after a certain number of minutes when the meeting was created 2011-08-19 10:41:53 -04:00
Richard Alam
28a8db58a3 - remove FLAT_REPO as we don't need it anymore. 2011-08-17 20:17:57 +00:00
Marco Calderon
e190d80e50 fixed name in meetings 2011-08-17 15:26:06 +00:00
Marco Calderon
f052b776d7 a temp solution for show the recording name 2011-08-10 14:33:04 +00:00
Marco Calderon
18fba79c4c Added metadata to getMeetingInfo 2011-08-04 23:14:08 +00:00
Richard Alam
daeb7fafc2 - bump api version to 0.8 2011-08-04 10:35:49 -04:00
Richard Alam
8ffc8c9bdc - hook-up expired meeting background proc 2011-07-23 16:53:34 -04:00
Richard Alam
3c76ace954 - have the background cleaner run eveyr minute 2011-07-23 16:47:06 -04:00
Richard Alam
0525511764 - add logging for meeting cleaner background proc 2011-07-23 16:36:27 -04:00
Richard Alam
8e983345b8 - add property to set timeout for allowing time between creating a meeting and joining a meeting 
- change default meeting expiration to 1 minute
 - trigger ingest and processing when the meeting is removed form memory instead of when the last
   user leaves the meeting
 2011-07-23 11:13:29 -04:00
Marco Calderon
d32110d36c api according to the latest spec 2011-06-30 02:33:12 +00:00
Richard Alam
2c65cc9ac2 - fix possible NPE when getting internal id of non-existing meeting 2011-07-20 15:26:19 -04:00
Richard Alam
b9e5b69a20 - add messageId to redis pub/sub messages to be able to filter and identify easily 2011-07-20 11:44:11 -04:00
Richard Alam
4d2e503214 - add param to remove the meeting right away from memory instead of letting 
it linger for about an hour (the value of the expire meeting).
 2011-07-19 16:03:36 -04:00
Richard Alam
46ea659796 - change default meeting duration to 0 (zero) which means no duration. This maintains 
compatibility with previous release allwoing the demo meeting to run infinitely (for
   example). 3rd-party apps must pass duration if they want to set it, especially if the
   meeting is being recorded.
 2011-07-19 15:27:18 -04:00
Richard Alam
c5f8aa9344 - rename simple playback to slides playback 2011-07-19 14:33:17 -04:00
Richard Alam
1796fbc777 - if there are any users in the meeting, then meeting is running 
- set the meeting to forciblyEnded if the end api has been called
 2011-07-19 13:49:11 -04:00
Marco Calderon
dd57d38fc4 fixed preupload 2011-06-24 21:04:10 +00:00
Marco Calderon
b9ee42b30d finish demo recording 2011-06-24 16:28:32 +00:00
Marco Calderon
e5e061ea99 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into refactor-bbb-api 2011-06-23 07:55:19 +00:00
Richard Alam
d44fd0cbdd Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-07-10 16:13:02 -04:00
Richard Alam
8a013304b6 - fix problem where %%CONFNAME%% doesn't get substituted 2011-07-10 16:11:14 -04:00
Fred Dixon
6f6cc70c6b Change set redisHost to 127.0.0.1 to match other config files 2011-07-10 10:23:01 -07:00
Richard Alam
9c3389e68f - fix problem for getting viewer password 2011-07-08 17:04:51 -04:00
Richard Alam
15990d2f55 - start hooking the api for recording 2011-06-27 12:52:17 -04:00
Richard Alam
7f4d38b5a6 - process metdata properly and simple playback 2011-06-26 10:56:03 -04:00
Richard Alam
dbfd92bff2 - fix join and create api 2011-06-24 11:09:12 -04:00
Richard Alam
9b3d901e34 - move things around 2011-06-24 10:57:56 -04:00
Richard Alam
c9ad8f15d7 - temporary commit 2011-06-23 17:02:37 -04:00
Richard Alam
f8abc966e9 - fix logout 2011-06-23 14:18:20 -04:00
Richard Alam
8c8e009baa - unit test passing again 2011-06-23 14:04:00 -04:00
Marco Calderon
af70819578 finish demo recordings 2011-06-23 07:54:23 +00:00
Richard Alam
e9bd55a563 - fix compile problem...get recordings isn't wired yet 2011-06-22 16:40:23 -04:00
Richard Alam
15b29db03f - add playback format into metadata.xml 
- implement get recordings for a meeting id
 2011-06-22 16:35:11 -04:00
Richard Alam
d044221d70 - start implementing get recording api 2011-06-22 15:53:27 -04:00
Marco Calderon
f02f1efffe need to add actions publish, unpublish, delete to the demo10 2011-06-22 06:32:08 +00:00
Richard Alam
0b6e59e8ab - add duration parameter on creat API. This allows us to set a limit on the meeting length 
to prevent continuously recording a meeting whe someone forgets to logout
 2011-06-21 14:16:37 -04:00
Richard Alam
140c187fd0 - clean-up 2011-06-20 16:36:41 -04:00
Richard Alam
3b67e6b5ef - group errors and send them all at once to the caller of the api 
- make errors consistent
 - return back createTime on a create API call
 - require createTime parameter on a join API call. This way users with stale join link won't be
   able to join a running meeting.
 2011-06-20 16:18:57 -04:00
Marco Calderon
fd8296c183 finish API 0.8... need to update response messages 2011-06-16 18:37:14 +00:00
Marco Calderon
42f4acd250 added setpublish, pending response xml 2011-06-16 14:43:31 +00:00
Marco Calderon
fc55bb8aee added to check multiple recordings in the call getRecordings 2011-03-08 21:06:04 +00:00
Marco Calderon
625d54e86c getRecordings call... Need to show metadata values 2011-03-08 09:44:31 +00:00
Marco Calderon
81627bc616 initial cleanup 2011-03-07 20:18:33 +00:00
Marco Calderon
356c77b41f removed redisport and redishost properties 2011-03-07 06:15:02 +00:00
Richard Alam
2454e6b9a1 - add timestamp to internal meeting id. So that the external meeting id can be re-used 
especially if the meeting is recorded.
 2011-06-16 16:45:14 -04:00
Richard Alam
8ba1e6484a Merge branch 'master' into ref-bbb-web-2 
Conflicts:
	bbb-video/.gitignore
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/RedisDispatcher.java
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
	bigbluebutton-web/src/java/org/bigbluebutton/api/RedisDispatcherImp.java
 2011-06-16 14:49:57 -04:00
Richard Alam
7cdc6adb83 - cleanup 2011-06-16 14:43:40 -04:00
Richard Alam
a71b30af9c - cleanup, fix merge issues, connect to redis explicitly when subscribing to a channel 2011-06-16 10:46:59 -04:00
Richard Alam
2765a178ce - merging changes from Markos 
Conflicts:
	bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/presentation/OfficeToPdfConversionSuccessFilter.java
	bigbluebutton-web/src/java/org/bigbluebutton/presentation/SupportedDocumentFilter.java
	bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/SwfSlidesGenerationProgressNotifier.java
 2011-06-16 09:28:14 -04:00
Richard Alam
0452324425 - putting back code 2011-06-16 09:18:57 -04:00
Richard Alam
120275071e - now DI works fine...had to delete bin and target dirs remnants from maven build 2011-06-15 17:28:31 -04:00
Richard Alam
58b51c9146 - remove spring integration....having problem with dependency injection 2011-06-15 16:57:06 -04:00
Marco Calderon
d022aafb61 Cleanup bigbluebutton-web and bigbluebutton-apps 2011-06-15 08:30:56 +00:00
Marco Calderon
04dff406e8 Merge branch 'ref-bbb-web-2' of github.com:bigbluebutton/bigbluebutton into ref-bbb-web-2 
Conflicts:
	bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
 2011-06-14 01:47:32 +00:00
Marco Calderon
e858828162 added gson and publish updates in bbb-web, missing receiving code in bbb-apps 2011-06-14 01:43:55 +00:00
Richard Alam
769470e232 - remove jms messages 2011-06-10 15:29:11 -04:00
Marco Calderon
2ac6aaa09a merge remove-bbb-commons, working prototype, need to add status method to listener 2011-06-09 01:35:24 +00:00
Richard Alam
09e7475cd7 - point recorded status dir to the correct one 2011-06-03 11:19:53 -04:00
Richard Alam
1bb6e20291 - renamed ingenst-and-processing script 
- log when saving metadata
 2011-06-03 11:15:24 -04:00
Richard Alam
c3b0e376c5 Merge branch 'master' into ref-bbb-web-2 
Conflicts:
	bigbluebutton-web/src/java/org/bigbluebutton/api/RedisDispatcherImp.java
 2011-06-02 16:40:36 -04:00
Markos Calderon
105f13cc9a Edited bigbluebutton-web/web-app/demo/demo6.jsp via GitHub 2011-06-02 08:47:29 -07:00
Markos Calderon
196a9ccc2c fix demo6 2011-06-02 08:39:57 -07:00
Richard Alam
53ecbf53ba - cleanup 
- just store meeting info into metadata redis key
 2011-06-02 11:31:52 -04:00
Richard Alam
134be90359 - handle incoming messages from bbb-apps 2011-06-01 17:58:55 -04:00
Richard Alam
50dac08e11 - cleanup sign out api 2011-06-01 14:16:35 -04:00
Richard Alam
c6626c7a9a - write test for get meetings api 2011-06-01 12:42:50 -04:00
Richard Alam
ed1bf9d4f6 - implement test for get meeting info 2011-06-01 12:10:33 -04:00
Richard Alam
8d63e0a717 - continue refactoring bbb-web, renamed a few classes, and change get-meetings-info api 2011-06-01 10:51:40 -04:00
Marco Calderon
1b8011fdce Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-06-01 05:31:12 +00:00
Richard Alam
de9f45bee9 - add meeting metadata 2011-06-01 18:07:57 -04:00
Marco Calderon
65c020fac0 demo recording page 2011-06-01 05:30:17 +00:00
Richard Alam
46a769cf2f - add test for end api 2011-06-01 02:47:01 +00:00
Richard Alam
c114289042 - add test for isMeetingRunning api 2011-05-31 17:51:07 -04:00
Richard Alam
e3ef2e5f6f - add isMeetingRunning test 2011-05-31 16:59:04 -04:00
Richard Alam
6f9563b190 - put some steps into own methods 2011-05-31 16:10:31 -04:00
Richard Alam
78adae0696 - join and create api have unit tests 2011-05-31 15:23:44 -04:00
Richard Alam
c40976dab5 - generate default voice conf numbers if none has been passed in the param. 2011-05-31 10:05:09 -04:00
Richard Alam
26f98fe879 - write test for create api 2011-05-30 17:39:03 -04:00
Richard Alam
cfe20900f2 - now has setup for testing 2011-05-30 16:26:11 -04:00
Richard Alam
335fd9591d - start refactoring bbb-web again...without trying to merge remove-bbb-commons branch 2011-05-30 01:42:50 +00:00
Richard Alam
4745b0e381 - run pubsub listener on own thread 2011-05-29 03:24:39 +00:00
Richard Alam
01669ce4d7 - move api controller test to another package 2011-05-29 02:33:37 +00:00
Richard Alam
db6f7b49f3 - put all redis classes into Messaging Service 
- wee need to be able to mock the messaging service to make it unit testable
 2011-05-29 02:32:13 +00:00
Richard Alam
ad9a4895b8 - cleanup jars 2011-05-28 17:57:09 +00:00
Richard Alam
0fbdd39a90 - add default metadata 2011-05-27 18:41:14 -04:00
Richard Alam
bc6c392da3 - formatting changes 2011-05-27 11:36:50 -04:00
Richard Alam
4748352a87 - remove bigbluebutton.properties override 2011-05-27 11:36:10 -04:00
Richard Alam
e4af92a9cc - start writing record api 2011-05-26 16:48:49 -04:00
Richard Alam
63636da8dc - add api controller unit tests 2011-05-26 14:25:31 -04:00
Richard Alam
54677ea07b - add README 2011-05-26 14:24:03 -04:00
Richard Alam
1e9a835615 - cleanup of bbb-web 2011-05-26 14:00:08 -04:00
Marco Calderon
5bbb607c5d Added redis pool, pubsub, and maven3 support to bbb-web 2011-05-17 11:04:40 +00:00
Marco Calderon
245070b366 removed bbb-commons. TODO: update process method and endrequest meeting 2011-05-14 05:56:35 +00:00
Marco Calderon
a9fcd56a88 refactoring bbb-apps 2011-05-11 02:09:10 +00:00
Richard Alam
e56ce0bd36 - have bbb-web write the recroding <meeting-id>.done file 2011-05-05 18:38:22 -04:00
Richard Alam
61ea9015e5 - set redis host and port in properties file 2011-05-04 11:14:35 -04:00
Richard Alam
e7bbf63484 Merge branch 'master' into record-and-playback-feature 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2011-05-03 14:50:37 -04:00
Marco Calderon
48029bf469 update thin instructions and layout 2011-04-28 20:28:33 +00:00
BigBlueButton
4db0ee6cf3 Fixed disconnect bug. 2011-04-12 20:08:31 +00:00
Marco Calderon
40cca71b04 added metadata parameter 2011-03-28 12:07:00 +00:00
Marco Calderon
7c2498597b Added support pubsub for send updates from bbb-apps to bbb-web 2011-03-28 07:19:22 +00:00
Richard Alam
65d6e61890 - call the ruby scripts from bbb-web 2011-04-15 18:19:51 -04:00
Richard Alam
19694d87e0 Merge branch 'master' into record-and-playback-feature 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationHandler.java
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
 2011-04-04 11:15:09 -04:00
Richard Alam
a1d983f204 - disable redis pubsub 2011-03-22 10:19:16 -04:00
Jeremy Thomerson
47126f4622 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into preupload_docs_beta 2011-03-22 18:15:20 -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
19c3971e1f - store meeting info in redis so we can include in events.xml 2011-02-16 10:34:49 -05:00
Richard Alam
fe44e0bf53 - setup jedis so we can put conference metadata into events.xml 2011-02-15 11:43:53 -05:00
Richard Alam
d1e2af2f38 - add eclipse plugin 2011-02-15 11:43:17 -05:00
Richard Alam
7fa4f4bbe8 - rename copyToLib to resolveDeps to be consistent with bbb-apps 2011-02-15 11:00:56 -05:00
Richard Alam
dda58fe6bb - put rec and playback required params in properties file 2011-02-15 10:41:15 -05:00
Richard Alam
a8d9a48fb2 - trigger archive, ingest, publish of recording when the last user leaves the meeting 2011-02-14 14:18:21 -05:00
Richard Alam
8d895d7417 - add temp way to trigger ingest and processing 2011-02-11 15:31:34 -05:00
Jeremy Thomerson
7a236a6809 downloading and processing of files works for urls and encoded files 2011-01-25 17:28:57 -06:00
Ubuntu
f255ba5e2b Changed bigbluebutton-web/build.gradle to reference Env. Var. for local repo 2011-01-31 18:51:01 +00:00
Ubuntu
c470d2cbaa Changed bigbluebutton-apps/build.gradle to reference an Env. Var. for local dir 2011-01-31 18:43:52 +00:00
Jeremy Thomerson
c8b24e849c more work on doc pre upload - xml parsing 
now we are parsing xml that is passed in following example format:
<?xml version="1.0" encoding="UTF-8"?>
<modules>
        <module name="foo">
        </module>
        <module name="presentation">
                <document url="http://www.samplepdf.com/sample.pdf" />
        </module>
</modules>
 2011-01-14 19:16:09 -06:00
Jeremy Thomerson
ef6bd3a5f1 first test of preuploading documents in api create command 
this commit is for testing only
it simply gets apicontroller working with presentationservice
it uses a test file on the server - rather than accepting files in
the http request (which is the next step)
 2011-01-14 18:07:18 -06:00
Jeremy Thomerson
79e71b9258 improve scripts to allow easy dev/run cycle 2011-01-13 21:13:29 +00:00
Marco Calderon
ea10e4bb7c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 
Conflicts:
	.gitignore
	bigbluebutton-web/application.properties
 2011-01-03 19:15:11 +00:00
Richard Alam
0f82ae3e26 - add getters and setters 2011-01-19 11:36:48 -05:00
Richard Alam
d0184c8210 - cleaning up bbb-web 2011-01-19 11:09:50 -05:00
Richard Alam
b42b43079b Merge branch 'master' into record-and-playback-feature 2011-01-18 17:36:47 -05:00
Richard Alam
272e46e38d - upgrade version of bbb-commons to 0.8 2011-01-12 09:50:36 -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
Marco Calderon
11167ae29f added chrome plugin patch for test recording 2010-11-19 05:04:16 +00:00
Marco Calderon
49d7ea37f4 fix bug recording 2010-11-17 06:34:18 +00:00
Marco Calderon
d18276e64f Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2010-11-11 03:01:42 +00:00
Marco Calderon
2d102450b9 added send parameter record from bbb-web to bbb-apps 2010-11-10 22:40:52 +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
Richard Alam
d01662da3e - handle findConference AGI call to check if a conference with a particular number is running 2010-11-02 09:39:56 -04:00
Marco Calderon
70d8e805b1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2010-10-30 19:54:08 +00:00
Marco Calderon
78794d5952 Fix bigbluebutton-web for recording 2010-10-30 19:51:40 +00:00
Marco Calderon
d186288749 added record conference call to BBB API 2010-10-24 08:59:23 +00:00
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
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
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
04a4428a88 Needed to add back picking up a configuration file from file:${userHome}/.grails/-config.properties so that we could setup the development environment on the VM without overwritting the existing bigbluebutton.properties 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3450 af16638f-c34d-0410-8cfa-b39d5352b314
 2010-01-23 01:19:57 +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
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