Commit 7637cedd authored 7 years ago by Richard Alam

Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0

parents 1ad81ba9 fb214b13

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/voice/UserJoinedVoiceConfEvtMsgHdlr.scala 1 addition, 0 deletions

...utton/core/apps/voice/UserJoinedVoiceConfEvtMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala 7 additions, 2 deletions

...n/scala/org/bigbluebutton/core/running/MeetingActor.scala
bbb-common-message/src/main/scala/org/bigbluebutton/common2/domain/Meeting2x.scala 1 addition, 1 deletion

...in/scala/org/bigbluebutton/common2/domain/Meeting2x.scala
bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java 2 additions, 1 deletion

...b/src/main/java/org/bigbluebutton/api/MeetingService.java
bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java 26 additions, 1 deletion

.../main/java/org/bigbluebutton/api/ParamsProcessorUtil.java
bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java 28 additions, 1 deletion

...b/src/main/java/org/bigbluebutton/api/domain/Meeting.java
bbb-common-web/src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java 2 additions, 1 deletion

...src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java
bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala 3 additions, 2 deletions

...rc/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
bigbluebutton-client/locale/en_US/bbbResources.properties 3 additions, 3 deletions

bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/resources/config.xml.template 0 additions, 1 deletion

bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/src/org/bigbluebutton/core/model/Meeting.as 3 additions, 1 deletion

...button-client/src/org/bigbluebutton/core/model/Meeting.as
bigbluebutton-client/src/org/bigbluebutton/main/model/options/MeetingOptions.as 0 additions, 31 deletions

...rc/org/bigbluebutton/main/model/options/MeetingOptions.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/EnterApiResponse.as 4 additions, 2 deletions

...rc/org/bigbluebutton/main/model/users/EnterApiResponse.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as 9 additions, 4 deletions

...ent/src/org/bigbluebutton/main/model/users/JoinService.as
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as 11 additions, 6 deletions

...ent/src/org/bigbluebutton/main/model/users/UserService.as
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml 14 additions, 1 deletion

...rc/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml 6 additions, 0 deletions

...-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
bigbluebutton-web/grails-app/conf/bigbluebutton.properties 3 additions, 0 deletions

bigbluebutton-web/grails-app/conf/bigbluebutton.properties
bigbluebutton-web/grails-app/conf/spring/resources.xml 1 addition, 0 deletions

bigbluebutton-web/grails-app/conf/spring/resources.xml
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy 3 additions, 4 deletions

...rs/org/bigbluebutton/web/controllers/ApiController.groovy

with 127 additions and 62 deletions

Please register or to comment