BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,536 Commits 13 Branches 260 Tags 1.1 GiB
86b58648f1
Commit Graph

186 Commits

Author SHA1 Message Date
Richard Alam
467598ffd2 - turn off keep alive message 2017-05-23 17:36:05 -07:00
Richard Alam
b8de0c9231 - add authorized role to registered user 2017-04-17 21:23:17 +00:00
Pedro Beschorner Marin
c74cc682c4 Merge remote-tracking branch 'mconf/mconf' 2017-03-20 19:45:59 +00:00
Richard Alam
1e8d7a5229 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into try-to-cleanup-connection 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
 2016-10-21 19:36:07 +00:00
Richard Alam
5ba3405941 - remove defunct connection when client auto-reconnects. 2016-10-20 15:08:58 +00:00
Ghazi Triki
b10237ebad Upgrade commons-codec dependency version to 1.10 2016-10-05 17:29:37 +01:00
Ghazi Triki
1d34bda5c2 Force audio profile in freeswitch transfer command. 2016-09-21 21:10:44 +01:00
perroned
0e3096d00d Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 2016-08-05 18:45:59 +00:00
Richard Alam
8e9b16776c Joining voice conf of breakout room 
A moderator should be able to listen-in on the breakout room. During a previous merge, the
 handler of the transfer message in FSESL was accidentally removed. The user isn't able to
 the breakout room's voice conference anymore.
 2016-08-05 13:58:07 +00:00
Anton Georgiev
2ae55432fd deskshare transition to webrtc screenshare changes 2016-07-29 16:16:55 +00:00
Anton Georgiev
01e0c99c58 subscribe for -DESKSHARE in meeting, adjust for liveMeeting 2016-07-20 21:39:36 +00:00
Richard Alam
58c239bc43 Merge branch 'master' into merge-bbb-1.1-dev-java8-with-master 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/resources/application.conf
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/RecorderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
	akka-bbb-fsesl/build.sbt
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/pubsub/receivers/RedisMessageReceiver.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/build.xml
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-web/build.gradle
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	record-and-playback/core/scripts/bigbluebutton.yml
 2016-05-16 11:35:36 -04:00
Richard Alam
7ae9b7b204 Merge branch 'merge-webrtc-ds' of https://github.com/antobinary/bigbluebutton into antobinary-merge-webrtc-ds 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-fsesl/build.sbt
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java
	akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-05-20 20:27:52 +00:00
Richard Alam
433f09f72d Merge branch 'dfengBBB' of https://github.com/dfeng99/bigbluebutton into dfeng99-dfengBBB 
Conflicts:
	bbb-common-message/build.sbt
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-05-20 15:40:50 +00:00
Anton Georgiev
228dfb4061 Merge branch 'mod-verto-1' of github.com:antobinary/bigbluebutton into merge-webrtc-ds 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/resources/application.conf
	akka-bbb-apps/src/main/scala/org/bigbluebutton/SystemConfiguration.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bbb-fsesl-client/build.sbt
	bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-client/build.xml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/BrowserCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-html5/app/client/NotificationControl.coffee
	bigbluebutton-html5/app/client/globals.coffee
	bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee
	bigbluebutton-html5/app/client/main.coffee
	bigbluebutton-html5/app/client/main.html
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
	bigbluebutton-html5/app/client/views/chat/chat_bar.coffee
	bigbluebutton-html5/app/client/views/modals/settings.coffee
	bigbluebutton-html5/app/client/views/modals/settings.html
	bigbluebutton-html5/app/client/views/users/user_item.coffee
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html
	bigbluebutton-html5/app/collections/collections.coffee
	bigbluebutton-html5/app/config.coffee
	bigbluebutton-html5/app/lib/router.coffee
	bigbluebutton-html5/app/server/collection_methods/meetings.coffee
	bigbluebutton-html5/app/server/collection_methods/users.coffee
	bigbluebutton-html5/app/server/publish.coffee
	bigbluebutton-html5/app/server/server.coffee
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	record-and-playback/presentation/scripts/process/presentation.rb
	record-and-playback/presentation/scripts/publish/presentation.rb
 2016-05-18 15:14:04 +00:00
Chad Pilkey
24c6d48dc2 removing files that should not have been committed 2016-05-02 12:45:25 -07:00
Richard Alam
b86f32b8c1 Sync with upstream repository 
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
 2016-04-26 20:01:20 -04:00
Ghaz Triki
11d86f6aa8 Merge 'branch air-ui' into 'mobile-client' 2016-04-26 09:19:17 +01:00
David Feng
67c14f9056 This enable avatar to be display in other participants video window 2016-04-20 14:08:13 +08:00
Anton Georgiev
095680cd46 resolve import issues 2016-03-30 17:34:34 -04:00
Richard Alam
a684aa4dfc Merge into bbb-1.1.dev 
Merge master, breakout rooms, and closed captioning into bbb-1.1-dev branch.

Conflicts:
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
 2016-03-21 18:12:30 +00:00
Anton Georgiev
12d61d0ddc remove unused classes 2016-02-04 20:53:43 +00:00
Ghazi Triki
2fb347bc25 Refactored the way that conference transfer between the parent room and breakout room is requested. 2016-02-03 22:30:08 +01:00
Anton Georgiev
0cdea4d9f0 add FreeSWITCH deskshare related conf 2016-02-03 20:00:29 +00:00
Pedro Beschorner Marin
e9cc024e5e Added exception handlers to deskshare actors and refactored the akka ones 2016-02-03 18:41:49 +00:00
Anton Georgiev
21f2d7a788 limit -DESKSHARE to fsesl only, not akka-bbb-apps 2016-01-29 20:52:14 +00:00
Ghazi Triki
eb0243634f Make sure that TransferUsetToMeetingCommand is executed by freeswitch. 2016-01-28 21:28:12 +01:00
Ghazi Triki
2968f69939 Fixed conference transfer command syntax for getCommandArgs method. 2016-01-28 20:12:10 +01:00
Pedro Beschorner Marin
d74c571958 Akka actors now print and log the exceptions and are kept alive 2016-01-28 18:15:24 +00:00
Ghazi Triki
edef66357c Fixed TransferUserToVoiceConfRequestMessage properties names. 2016-01-28 19:11:43 +01:00
Ghazi Triki
cda1e800d2 Deleted non exisint class from import in RedisMessageReceiver.java 2016-01-28 15:04:46 +01:00
Anton Georgiev
08d6ee36f9 recover videoWidth, videoHeight params 2016-01-27 21:42:10 +00:00
Ghazi Triki
053a432ce8 Enable a higher log level for akka-bbb-fsesl application. 2016-01-27 22:24:43 +01:00
Ghazi Triki
62a721b310 Update gson library version to 2.5 for all server projects. 2016-01-27 16:44:22 +01:00
Ghazi Triki
aedeb7050c Added missing class TransferUsetToMeetingCommand.java 2016-01-27 12:27:45 +01:00
Ghazi Triki
9b66cf30f9 Added transfer user from the parent voice conference to a selected breakout voice conference. 2016-01-27 12:00:32 +01:00
Anton Georgiev
7bedb7d6f7 missed some lines in recorderActor. also clean up 2016-01-26 20:23:50 +00:00
Anton Georgiev
0d9c2d1472 remove dependency on vh, vw. remove obsolete code. clean up 2016-01-26 18:53:26 +00:00
Richard Alam
c66c180040 - make the flash client not attempt to reconnect when the user has been ejected from the meeting. 2016-01-19 16:16:12 +00:00
Anton Georgiev
c28bbce889 add data and clean up 2016-01-13 22:54:03 +00:00
Anton Georgiev
30462cd299 parse properly {}rtmp:// paths 2016-01-13 22:54:03 +00:00
Anton Georgiev
b5fafe25ca Removing recording code used in the past for recording to file via FS. obsolete as we now record in red5 2016-01-08 21:58:10 +00:00
Anton Georgiev
23a83ab6e9 destoy deskshare on FS if presenter leaves 2016-01-08 19:07:57 +00:00
Richard Alam
16499b3da1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into merge-master-into-ghazi 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	akka-bbb-fsesl/build.sbt
	bigbluebutton-web/build.gradle
 2016-01-07 22:58:04 +00:00
Travis Kemen
6c9238b105 A few fixes for event socket differences between FreeSWITCH 1.4 and 1.6 2015-12-29 19:30:48 -06:00
Ghazi Triki
fad585051b akka-bbb-fsesl/build.sbt uses bbb-common-message 0.0.16-SNAPSHOT 2015-11-03 21:51:21 +01:00
Anton Georgiev
8e407df405 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-1 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bigbluebutton-apps/build.gradle
 2015-10-22 20:46:30 +00:00
Anton Georgiev
f08cd5262e temp changes 2015-10-13 19:00:50 +00:00
Richard Alam
93dd5186b4 - user internal user id for user in the voice conf 2015-09-30 18:55:17 +00:00
Richard Alam
2278ee01ec - upgrade bbb-commons-message version 2015-09-14 21:45:55 +00:00
Richard Alam
44763bf283 - try to fix lock settings 2015-09-14 20:18:27 +00:00
Anton Georgiev
8b58671948 cleaning up 2015-09-10 15:24:08 +00:00
Anton Georgiev
eb57aa7da1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-share-merging 2015-08-24 14:31:00 +00:00
Richard Alam
0e2e79fce8 - change redis pool config 
- reconnect to redis if connection to subscribe disconnected
 2015-08-23 04:56:30 -04:00
Anton Georgiev
1939dac06c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-share 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/RedisMessageReceiver.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingMessageHandler.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/recorders/WhiteboardEventRedisRecorder.scala
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/WhiteboardKeyUtil.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/DeskshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/PublishWindowManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/ViewerWindowManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/DeskshareService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
 2015-08-21 20:15:37 +00:00
Richard Alam
46ba98f737 - add ping/pong message between different components to verfiy that we have working path 2015-08-20 20:44:40 +00:00
Richard Alam
a3318e5f90 - send keep alive message 2015-08-19 14:33:46 +00:00
Richard Alam
5472548118 - allow custom polling through chat message 2015-08-17 22:40:31 +00:00
Anton Georgiev
4db2ebb86e flag for ds started; cleaning up logs 2015-08-11 20:30:07 +00:00
Richard Alam
4e4270912b - fix issue where deleting presentation doesn't remove the presentation from file upload window 2015-08-11 17:21:09 +00:00
Richard Alam
bc7aadcd22 - create new bbb-commons jar 2015-08-07 19:46:52 +00:00
Richard Alam
aa6191402c - change logging level as it was logging too much 2015-08-05 16:28:16 +00:00
Richard Alam
087c07a6a8 Merge branch 'development' of https://github.com/bigbluebutton/bigbluebutton into add-num-responders 2015-07-13 19:20:31 +00:00
Richard Alam
822b319440 - add number of responders on poll result 2015-07-13 19:18:37 +00:00
Anton Georgiev
6560da3632 cleaning up 2015-07-10 15:33:27 +00:00
Ghazi Triki
1ac5a308b5 Improve .gitignore files with better patterns. 2015-07-09 16:13:09 +01:00
Anton Georgiev
9f5783c0b4 use real meetingId+timestamp broadcast path 2015-07-08 14:35:51 +00:00
Richard Alam
3ed524a34c - upgrade bbb-commons-message version 2015-07-07 21:36:01 +00:00
Anton Georgiev
8de66fd448 ds rtmp displays in Flash client 2015-07-07 19:17:27 +00:00
Richard Alam
5060726035 - format poll result data correctly 2015-07-06 22:12:15 +00:00
Richard Alam
6d7b93e6a4 - upgrade bbb-common-message version 2015-07-02 19:23:36 +00:00
Anton Georgiev
7192079977 send to BBB-Apps vh, vw, samplerate, fps, channels 2015-06-30 18:50:29 +00:00
Anton Georgiev
d7682f97b8 auto start/stop rtmp broadcast 2015-06-29 14:27:35 +00:00
Anton Georgiev
09e907d2ba auto start/stop video rec based on meeting isRecorded 2015-06-26 19:54:07 +00:00
Anton Georgiev
922ab7cc04 distinguish between rtmp broadcast and file record 2015-06-25 14:28:23 +00:00
Anton Georgiev
0e362e9762 FS deskshare serverside cont'd 2015-06-23 19:45:36 +00:00
Richard Alam
acb8a8c89a - implement sending of polling messages thru redis 2015-06-22 21:27:44 +00:00
Anton Georgiev
8b161e8217 record command; record messages 2015-06-19 20:38:54 +00:00
Richard Alam
35ebeb3bce - try to fix log location 2015-06-19 14:24:29 +00:00
Anton Georgiev
bdb56d4884 FS video share/view messages from fs to bbb-apps 2015-06-18 22:07:15 +00:00
Richard Alam
468217200f - fix welcome message bug 
- fix private chat bug
 - start implementing polling
 2015-06-16 19:18:23 +00:00
Richard Alam
a734f5c64e - upgrade version and fix description 2015-06-10 20:45:29 +00:00
Richard Alam
36b9dc0104 - use bbb-common-message 2015-06-10 19:11:31 +00:00
Richard Alam
b178f7f077 - make bbb-fsesl use common messages 2015-06-10 18:30:31 +00:00
Richard Alam
bc214f3a32 - fix message name 2015-06-10 18:30:05 +00:00
Richard Alam
24b957e9e3 - rename to reflect this is our esl client to FS 2015-06-09 19:03:02 +00:00