BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,793 Commits 13 Branches 260 Tags 1.1 GiB
b8de0c9231
Commit Graph

402 Commits

Author SHA1 Message Date
Richard Alam
372b571b7b - add pretty create date, duration, and user has joined info on getMeeting api response 2014-09-02 10:22:24 -07:00
Felipe Cecagno
dd97b8f80c Merge branch 'encrypted-recording' into 090-encrypted-recording 
Conflicts:
	bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2014-09-01 16:46:03 -03:00
Anton Georgiev
e9113f3d9f Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2014-08-20 18:59:50 +00:00
Anton Georgiev
c9ad7035b1 Merge branch 'merging-html5-with-master' of https://github.com/antobinary/bigbluebutton 2014-08-20 18:57:55 +00:00
Richard Alam
11b8fa711e - provide a way to support pre-built config.xml 2014-08-20 11:42:31 -07:00
Anton Georgiev
adf20cca7d Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merging-html5-with-master 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/whiteboard/WhiteboardApp.scala
 2014-08-20 15:24:25 +00:00
Richard Alam
9f63ddd1f7 - add new param (moderatorOnlyMessage) on CREATE API 2014-08-20 07:37:31 -07:00
Richard Alam
c56fde0c42 Merge pull request #348 from speakserve/unify-version-number 
Unify version number
 2014-08-13 14:17:45 -04:00
Anton Georgiev
404ff72914 use high qulity png conversion for the slide, not just the thumbnail 2014-08-07 20:12:55 +00:00
Richard Alam
109f973cbd - check on create api call if meeting has been forcibly ended 2014-08-07 09:32:18 -07:00
Ghazi Triki
57d7a15b89 Reverted back API version to 0.81 with updates in outdate files 2014-07-31 18:53:24 +01:00
Ghazi Triki
ac7af7dfea Manually bumped all application version to the correct actual version 0.9.0-dev 2014-07-31 17:42:38 +01:00
Richard Alam
9eef8e994b - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1709 2014-07-28 13:56:49 -07:00
Richard Alam
c10bc2a42c - return authToken when redirect=false on JOIN API call 2014-05-10 08:59:03 -07:00
Richard Alam
283a3fa3eb - modify messages 2014-05-09 17:49:01 -07:00
Richard Alam
8dfe46bfba - changing message format between bbb-web and bbb-apps 2014-05-09 21:21:21 +00:00
Richard Alam
ca089d6af0 - minor cleanup 2014-05-05 18:35:01 +00:00
Richard Alam
ba08100b35 Merge branch 'merge-polling-with-master' of github.com:bigbluebutton/bigbluebutton into connect-bbb-apps-html5 2014-05-01 15:38:14 +00:00
Calvin Walton
7d78e46cad Support passing through XML extensions in getRecordings 
Recording processing scripts can now add arbitrary XML elements in
the extensions section of the metadata.xml file, and those
element will be copied to the getRecordings XML response.
 2014-04-24 16:34:59 -04:00
Richard Alam
bee1320463 Merge branch 'merge-polling-with-master' into connect-bbb-apps-html5 
Conflicts:
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
 2014-04-08 19:07:37 +00:00
Anton Georgiev
2d89a73c0c Merge branch 'addMsgLib' of /home/ubuntu/dev/antonHtml5/bigbluebutton into connect-bbb-apps-html5 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/RedisMessagingService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/ConversionUpdatesProcessor.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardService.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
	bigbluebutton-web/grails-app/conf/UrlMappings.groovy
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
	bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
	bigbluebutton-web/ivy.xml
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	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/imp/SwfSlidesGenerationProgressNotifier.java
 2014-04-08 15:55:04 +00:00
Richard Alam
7e0af3e042 - check if meeting has been forciblyEnded and don't let the user join if it is 2014-04-02 20:01:29 +00:00
Richard Alam
3742ebc1c2 - prevent the user from rejoining meeting when meeting has ended 2014-04-02 19:45:58 +00:00
Richard Alam
090cb4115b - fix issue where getMeetings and getRecordings calls just loops back resulting in StakOverflow 2014-04-02 16:17:24 +00:00
Richard Alam
d15e8c3a5b - continue cleaning up presentation 2014-02-27 21:41:25 +00:00
Richard Alam
9f00d960d1 - modify to generate presentation ids instead of using filename as id 2014-02-26 21:45:25 +00:00
Richard Alam
6cf30e9f07 - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
Felipe Cecagno
417b518c2b Merge branch 'v0.81-release' of https://github.com/bigbluebutton/bigbluebutton into guest-role-0.81 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-02-24 12:37:35 -03:00
Richard Alam
5559a2b8cc Merge branch 'master' into merge-polling-with-master 
- there are compile issues we need to fix

Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/ParticipantUpdatingRoomListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.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/webapp/WEB-INF/bbb-apps.xml
	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/modules/present/ui/views/SlideView.mxml
 2014-01-23 20:49:04 +00:00
alexandrekreis
b6e3137596 refs #930 2013-11-28 11:16:52 -02: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
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
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
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
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
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
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
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
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
Markos Calderon
7f748fd809 reading polls from create API call 2013-06-05 17:56:03 -05:00
Calvin Walton
085294af6d Fix typo 'defaulLayout' in join parameters 2013-05-30 17:47:26 -04: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
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
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
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
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
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
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
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
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
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
9e45420a4c load presentation in both sides html5 and flex 2012-10-20 14:18:39 -05: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
c878ff5d06 added redirect and clientURL parameters to the API 2012-09-21 16:03:53 -05: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
Markos Calderon
3c7419c5ef load textfile from the client 2012-07-17 16:39:32 -07:00
Leonardo Crauss Daronco
1f4c32cef3 Added <listenerCount> and <videoCount> to the response of 'getMeetings'. 2012-05-25 14:19:15 -03:00
Leonardo Crauss Daronco
6a5c39d012 Added <participantCount> to the reponse of getMeetings. 2012-04-03 12:04:29 -03: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
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
Richard Alam
ecc979e274 - generate internal userid to be able to match users across subsytems 2012-01-18 15:46:29 +00: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
Markos Calderon
ea5331d0c9 now, bbb-web uses the internalUserId 2012-01-09 14:44:14 -08:00
Markos Calderon
c2b0f1588f fix urlencode in pre upload 2011-11-11 09:23:30 -08: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
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
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
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
Marco Calderon
18fba79c4c Added metadata to getMeetingInfo 2011-08-04 23:14:08 +00: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
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
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
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
Richard Alam
d044221d70 - start implementing get recording api 2011-06-22 15:53:27 -04: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
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
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
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
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
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
Marco Calderon
245070b366 removed bbb-commons. TODO: update process method and endrequest meeting 2011-05-14 05:56:35 +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
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
Marco Calderon
0fdb2d4875 some changes in bbb-web and bbb-apps for pubsub 2011-02-22 17:13:00 +00: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
Richard Alam
0f82ae3e26 - add getters and setters 2011-01-19 11:36:48 -05: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
Marco Calderon
49d7ea37f4 fix bug recording 2010-11-17 06:34:18 +00:00
Marco Calderon
2d102450b9 added send parameter record from bbb-web to bbb-apps 2010-11-10 22:40:52 +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
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
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
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
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
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
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
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
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