bigbluebutton-Github

History

Ghazi Triki 653fd74440 Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master # Conflicts: # akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala # akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala # akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala # akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala # akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/testdata/FakeTestData.scala # bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java # bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java # bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java # bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Office2PdfPageConverter.java # bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeDocumentValidator.java # bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java # bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java # bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/SvgImageCreatorImp.java # bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/TextFileCreatorImp.java # bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala # bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala # bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.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/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/views/LoggedOutWindow.mxml # bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as # bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as # bigbluebutton-client/src/org/red5/flash/bwcheck/app/BandwidthDetectionApp.as # bigbluebutton-config/bigbluebutton-release # bigbluebutton-html5/client/compatibility/kurento-extension.js # bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js # bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy		2018-11-01 14:00:54 +01:00
..
lib	- adding build and lib folder while ignoring their contents. This way, the build and lib folder	2010-06-15 15:56:20 -04:00
src	Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master	2018-11-01 14:00:54 +01:00
.gitignore	- change poll config for jedis	2015-08-23 07:09:00 -04:00
build.gradle	Updated JVM projects dependencies and configuration.	2018-08-05 22:37:11 +01:00
deploy.sh	- allow deploying of sip app to red5	2018-10-25 15:55:34 -07:00
INSTALL	- test tracking branch	2010-06-18 20:42:52 +00:00
README	- add build info and test tracking branch again	2010-06-18 21:00:29 +00:00
testng.xml	- add testng.xml for unit testing	2010-08-20 11:02:57 -04:00
vm-build.sh	- modify to use new gradle task	2010-08-20 11:03:32 -04:00

README

To build
gradle copyToLib
gradle eclipse

import into eclipse
setup build path