BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,018 Commits 13 Branches 260 Tags 1.1 GiB
2073c742b6
Commit Graph

712 Commits

Author SHA1 Message Date
Richard Alam
fee5a208c8 - minimize the number of threads required for doc conversion 2014-07-22 14:42:30 -07:00
Richard Alam
89af96714f - don't create threads unnecessarily when processing uploaded presentations 2014-07-22 14:26:18 -07:00
Richard Alam
bc655811c6 - don't clear newer pending ping messages when red5 recovers 2014-07-05 03:38:12 -07:00
Richard Alam
fb269a3c6b - remove user sessions from hashmap when user leaves and when meeting is destroyed to 
prevent memory leaks
 2014-05-26 08:32:56 -07:00
Richard Alam
4a4241ee78 - make sure create, register user and validate are in correct sequence 2014-05-21 13:56:37 -07:00
Richard Alam
53a86bafba - add check to handle whne user has joined the meeting 2014-05-20 15:35:03 +00:00
Richard Alam
dffd727674 Merge pull request #327 from gugat/tobitmaps 
convert graphics to bitmap
 2014-05-14 17:00:39 -04:00
Gustavo Salazar
748f3728ec convert graphics to bitmap if pdf-swf conversion fails 2014-05-13 18:34:56 -05:00
Richard Alam
8d0ad3ce19 - see if builds get triggered 2014-05-11 13:08:05 -07:00
Richard Alam
90d5c2ac79 - remote log jars to fix compile issue 2014-05-11 12:31:29 -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
04f49c29e6 - fix user an dmeeting messages 2014-05-08 19:52:35 +00:00
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
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
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