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
..
addDialInUser.js	re-use function	2018-08-16 09:21:13 -03:00
addUser.js	Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master	2018-11-01 14:00:54 +01:00
changeRole.js	maintain array of user roles so they are unique	2018-09-25 19:24:43 +00:00
clearUsers.js	solve merge issues	2017-10-23 13:47:14 -02:00
createDummyUser.js	Remove duplicated log	2017-12-13 16:20:29 -02:00
removeUser.js	Stop HTML5 ejecting from voice on reconnect and fix voice user creation	2018-10-24 11:40:38 -07:00
setApprovedStatus.js	Changed imports and removed 'initializeCursor.js' since it's not needed	2017-10-11 19:00:28 -07:00
setConnectionIdAndAuthToken.js	Rename function name to match his functionality	2018-04-02 14:08:25 -03:00
setConnectionStatus.js	Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter	2017-10-12 15:36:52 -03:00
userEjected.js	Changed imports and removed 'initializeCursor.js' since it's not needed	2017-10-11 19:00:28 -07:00