Skip to content
Snippets Groups Projects
  1. Mar 24, 2016
  2. Mar 21, 2016
    • Richard Alam's avatar
      Upgrade to Java 8 · 7d5c9d63
      Richard Alam authored
       Upgrade to Java 8 and merge screenshare feature.
      
      Conflicts:
      	bigbluebutton-client/.actionScriptProperties
      7d5c9d63
    • Richard Alam's avatar
      Merge pull request #3060 from ritzalam/bbb-1.1-dev · 398249af
      Richard Alam authored
      Updating branch with latest from master
      398249af
    • Richard Alam's avatar
      Merge into bbb-1.1.dev · a684aa4d
      Richard Alam authored
       Merge master, breakout rooms, and closed captioning into bbb-1.1-dev branch.
      
      Conflicts:
      	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
      	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
      	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
      a684aa4d
    • Richard Alam's avatar
      Merging breakout rooms with the master branch · 7fe44355
      Richard Alam authored
       Merge breakout rooms feature with master branch. This
       also includes closed captioning feature.
      
      Conflicts:
      	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
      	bigbluebutton-web/.classpath
      	bigbluebutton-web/.settings/org.eclipse.jdt.core.prefs
      	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
      	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
      7fe44355
  3. Mar 15, 2016
  4. Mar 14, 2016
  5. Mar 11, 2016
  6. Mar 10, 2016
  7. Mar 08, 2016
  8. Mar 07, 2016
Loading