BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,679 Commits 13 Branches 260 Tags 1.1 GiB
88ad0fb09b
Commit Graph

907 Commits

Author SHA1 Message Date
Richard Alam
e915c72331 - start formatting json messages for users and meeting 2014-05-07 21:42:32 +00:00
Richard Alam
79ce612a19 - fix compile issue 2014-05-07 14:06:58 +00:00
Richard Alam
ca089d6af0 - minor cleanup 2014-05-05 18:35:01 +00:00
Richard Alam
9e401d6a13 - truen create meeting into a message instead of using a direct method call 2014-05-05 18:34:19 +00:00
Richard Alam
f30dd78f5e - put apps into their own channel 2014-05-05 18:33:39 +00:00
Richard Alam
0f4cb19133 - the executor should continue processing messages instead of just once 2014-05-02 20:55:12 +00:00
Richard Alam
1fd2933bfd - fix processing of png image 2014-05-01 20:56:34 +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
Richard Alam
a3b65bcabf - fix race condition on create and join api call 2014-05-01 15:37:39 +00:00
Richard Alam
2dc729cecb - try running the meeting service into it's own thread 2014-05-01 15:24:11 +00:00
Richard Alam
51e489a143 - modify how we send and receive messages to/from redis 2014-04-30 21:45:53 +00:00
Richard Alam
75d908625c - setup messaging classes 2014-04-30 15:53:27 +00:00
Richard Alam
db01b1727f - set bbb-apps as available when it starts replying to the keep alive messages again 2014-04-29 15:33:53 +00:00
Richard Alam
ef6ffa20df - make keep alive run on it's own thread 2014-04-28 22:00:48 +00:00
Richard Alam
55f80252b7 - remove PNG generation step in doc conversion as it takes a long time 2014-04-28 20:19:27 +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
c44f4c90a3 - wire up png converter 2014-04-19 09:23:06 -07: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
Richard Alam
6ab5feb117 - fix compile issues 2014-04-08 18:49:29 +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
Fred Dixon
11b0d0eca7 Bumped footer message in chat to say 0.9.0-dev 2014-04-02 21:35:40 +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
e5eb48a90f - fix recording 2014-03-12 18:37:11 +00:00
Fred Dixon
ff87e59e5c removed carriage returns from bigbluebutton.properties as it was causing errors with bbb-conf 2014-03-12 01:18:19 +00:00
Richard Alam
31926bd26d - implement end and destroy meeting 2014-03-10 21:38:03 +00:00
Richard Alam
4c5739a43c - change path to pdf2swf 2014-03-10 15:14:34 +00:00
Richard Alam
86abffc79b - add timer to check meeting duration 2014-03-09 14:41:24 -04:00
Richard Alam
6ec6553534 - send end meeting message from bbb-web 2014-03-09 00:05:43 -05:00
Richard Alam
db3686bd40 - fix compile error 
- fix url for slides
 2014-03-07 14:58:51 +00:00
Richard Alam
89e2f6363a - display presentation page 2014-03-03 18:39:04 +00:00
Richard Alam
d15e8c3a5b - continue cleaning up presentation 2014-02-27 21:41:25 +00:00
Richard Alam
feb49951a5 - add presentation ids to presentation conversion 2014-02-27 17:23:44 +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
17cbcb2676 - remove datasource config 
- add bbb-web.log config
 2014-02-25 20:06:00 +00:00
Richard Alam
6cf30e9f07 - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
Richard Alam
ff333b9232 - handle get presentation info message 2014-02-08 14:20:05 -05:00
Richard Alam
1c5c3cbdf3 - try to fix presentation messages 2014-02-07 17:23:11 -05:00
Richard Alam
29e94500c4 Merge branch 'refactor-voice-users' into merge-polling-with-master 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/red5/voice/ClientManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/ConferenceService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserJoinedEvent.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomImp.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomManager.java
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
 2014-01-28 21:12:01 +00: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
Felipe Cecagno
3440ed0fe3 Merge branch 'v0.81' into record-button 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
 2014-01-14 14:05:41 -02:00
Richard Alam
4b07e6d3ab Merge branch 'master' into html5-bridge-new-events 2014-01-06 13:20:35 -08:00
mohamed-ahmed
d35d00fd55 'all_slides' and move cursor events now working in new msg format 2013-11-18 19:36:27 +00:00
Fred Dixon
0d50884e08 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-11-07 20:08:48 -05:00
Fred Dixon
b12188fbed Changing lables for 0.81 2013-11-07 20:08:36 -05:00
Guilherme Augusto Dias
1d421f2d4a Retrieve duration 
BBB Web retrieves playback length from metadata.xml when it is available, otherwise playback length is calculated with start/stop meeting timestamps.
 2013-11-06 18:13:43 +00:00
Richard Alam
a58120f322 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1680 2013-11-05 18:28:12 +00:00
Fred Dixon
149ea185f2 Updating version to 0.81-RC5 2013-10-30 14:47:16 -07:00
tylercopeland
a4a806d254 lastest css updates 2013-10-29 19:38:52 -04:00
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
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
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
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
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
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
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
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
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
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
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