-
- Downloads
Merge branch 'development' into tab-indexer
Conflicts: bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
No related branches found
No related tags found
Showing
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/Poll.scala 4 additions, 4 deletions...pps/src/main/scala/org/bigbluebutton/core/apps/Poll.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/PollApp.scala 3 additions, 0 deletions.../src/main/scala/org/bigbluebutton/core/apps/PollApp.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala 31 additions, 9 deletions...src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala 17 additions, 0 deletions...c/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
- bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/BigBlueButtonApplication.java 13 additions, 4 deletions...java/org/bigbluebutton/red5/BigBlueButtonApplication.java
- bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/UserConnectionMapper.java 70 additions, 0 deletions...ain/java/org/bigbluebutton/red5/UserConnectionMapper.java
- bigbluebutton-client/branding/default/style/css/BBBDefault.css 6 additions, 0 deletions...uebutton-client/branding/default/style/css/BBBDefault.css
- bigbluebutton-client/branding/default/style/css/assets/images/icons-license.txt 4 additions, 1 deletion...randing/default/style/css/assets/images/icons-license.txt
- bigbluebutton-client/branding/default/style/css/assets/images/status_refresh.png 0 additions, 0 deletions...anding/default/style/css/assets/images/status_refresh.png
- bigbluebutton-client/libs/as3commons-logging-2.7.swc 0 additions, 0 deletionsbigbluebutton-client/libs/as3commons-logging-2.7.swc
- bigbluebutton-client/locale/en_US/bbbResources.properties 14 additions, 4 deletionsbigbluebutton-client/locale/en_US/bbbResources.properties
- bigbluebutton-client/resources/config.xml.template 1 addition, 0 deletionsbigbluebutton-client/resources/config.xml.template
- bigbluebutton-client/resources/prod/BigBlueButton.html 1 addition, 0 deletionsbigbluebutton-client/resources/prod/BigBlueButton.html
- bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar 0 additions, 0 deletions...tton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
- bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar 0 additions, 0 deletions...nt/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
- bigbluebutton-client/resources/prod/lib/bbb_deskshare.js 31 additions, 3 deletionsbigbluebutton-client/resources/prod/lib/bbb_deskshare.js
- bigbluebutton-client/resources/prod/lib/jsnlog.min.js 16 additions, 0 deletionsbigbluebutton-client/resources/prod/lib/jsnlog.min.js
- bigbluebutton-client/src/BigBlueButton.mxml 7 additions, 1 deletionbigbluebutton-client/src/BigBlueButton.mxml
- bigbluebutton-client/src/BigBlueButtonMainContainer.mxml 16 additions, 14 deletionsbigbluebutton-client/src/BigBlueButtonMainContainer.mxml
- bigbluebutton-client/src/BigBlueButtonTest.mxml 1 addition, 3 deletionsbigbluebutton-client/src/BigBlueButtonTest.mxml
Loading
Please register or sign in to comment