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
..
.meteor	added meteor/session; userList without router	2018-10-05 19:23:16 +00:00
client	Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master	2018-11-01 14:00:54 +01:00
imports	Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master	2018-11-01 14:00:54 +01:00
private	Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master	2018-11-01 14:00:54 +01:00
public	Remove unused code	2018-09-19 09:09:45 -03:00
server	Merge pull request #6076 from jfsiebel/custom-user-settings	2018-09-25 08:29:48 -04:00
tests	Prevent linter from ignoring the test files + some linting.	2018-10-12 14:46:26 -04:00
.babelrc	Integrated babel-plugin-react-remove-properties for Selenium tests	2017-11-04 00:38:44 -07:00
.dockerignore	update instructions and implementation of a working docker-compose (no recordings yet)	2018-08-24 17:15:47 -03:00
.eslintignore	Prevent linter from ignoring the test files + some linting.	2018-10-12 14:46:26 -04:00
.eslintrc.js	Add missing packages and fix formating	2017-06-05 13:26:47 +00:00
.gitignore	Add missing configuration file	2017-02-06 19:14:48 +00:00
docker-entrypoint.sh	- reduce size of the bbb-html5 image	2018-08-24 17:15:47 -03:00
Dockerfile	- update webhooks to use the same message format for bearer auth or checksum	2018-08-24 17:15:47 -03:00
Dockerfile.dev	push unfinished work on docker	2018-08-24 17:15:47 -03:00
package-lock.json	updated packages to fix vulnerabilities (npm audit)	2018-10-26 14:21:25 +00:00
package.json	added "repository" to package.json	2018-10-26 14:35:42 +00:00
test-html5.sh	Fixes	2018-10-03 13:47:31 -04:00
transifex.sh	do not pull the source file en.json	2018-01-25 11:41:25 -05:00