Skip to content
Commits on May 27, 2016
  1. @ritzalam

    Merge pull request #3147 from ritzalam/merge-bbb-1.1-dev-java8-with-m…

    …aster
    
    Merge bbb 1.1 dev java8 with master
    ritzalam committed May 27, 2016
Commits on May 26, 2016
  1. @ritzalam

    Flex 4 UI

     - build using gradle
     - launch from outside flex builder
    ritzalam committed May 26, 2016
Commits on May 25, 2016
  1. @ritzalam
Commits on May 24, 2016
  1. @ritzalam

    Merge branch 'new-ui-framework' of github.com:capilkey/bigbluebutton …

    …into merge-capilkey-with-master
    ritzalam committed May 24, 2016
  2. @capilkey

    Flex 4: Make AltMain just Main

    capilkey committed May 24, 2016
  3. @capilkey
  4. @ritzalam

    Merge branch 'new-ui-framework' of github.com:capilkey/bigbluebutton …

    …into merge-capilkey-with-master
    ritzalam committed May 24, 2016
  5. @ritzalam

    - fix dev instructions

    ritzalam committed May 24, 2016
  6. @ritzalam

    Merge branch 'breakout-rooms-porto-algre-2015' of github.com:riadvice…

    …/bigbluebutton into merge-bbb-1.1-dev-java8-with-master
    
    Conflicts:
    	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
    	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
    	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
    	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
    	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
    	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
    	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
    	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
    	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
    ritzalam committed May 24, 2016
Commits on May 23, 2016
  1. @capilkey
  2. @capilkey
Commits on May 21, 2016
  1. @capilkey
  2. @capilkey
  3. @capilkey
  4. @capilkey
  5. @capilkey
Commits on May 20, 2016
  1. @antobinary

    Merge pull request #3145 from oswaldoacauan/feature-actionsbar

    HTML5 - New Button component, basic styles and file structure
    antobinary committed May 20, 2016
  2. @ritzalam
  3. @ritzalam

    Merge branch 'merge-webrtc-ds' of https://github.com/antobinary/bigbl…

    …uebutton into antobinary-merge-webrtc-ds
    
    Conflicts:
    	akka-bbb-apps/build.sbt
    	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
    	akka-bbb-fsesl/build.sbt
    	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java
    	akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala
    	bbb-common-message/build.sbt
    	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
    	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
    	bigbluebutton-apps/build.gradle
    	bigbluebutton-web/grails-app/conf/spring/resources.xml
    	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
    ritzalam committed May 20, 2016
  4. @oswaldoacauan

    Merge branch 'master' into feature-actionsbar

    * master: (44 commits)
      - publish bbb commons messages to local by default
      bbb-web: Verified that all error messages from join are displayed in html
      bbb-web: Adjustments for the new error management - Removed old error managment from join - Refactored method respondWitErrors so it may responde with html or xml - Added validation for ignoring masUsers filter if maxUsers=0
      bbb-web: Fix for race condition that causes the maxParticipants filter to fail (registeredUser now tracks the timestamp instead of Date)
      bbb-config: index.html is now able to handle error messages when used as the default logoutURL
      bbb-web: Fix for race condition that causes the maxParticipants filter to fail (changed the format to error parameter)
      bbb-web: Fix for race condition that causes the maxParticipants filter to fail (implemented cleaner)
      Added blank pages to defaut.pdf for whiteboard
      Move from 1.0-RC to 1.0
      bbb-web: Fix for race condition that causes the maxParticipants filter to fail (tracking the joins)
      - add Occitan locale
      - fix offending locale that breaks build
      Update locales
      bbb-web: Implemented maxUsers/maxParticipants filter in Join
      fix shortcut key inconsistencies
      fix issue #3088
      Fix for issue #3110
      fix issue #3106
      Fix clicks on the thumbnails in the playback page
      Improve playback buttons and update colors in the playback page
      ...
    oswaldoacauan committed May 20, 2016
  5. @oswaldoacauan
  6. @oswaldoacauan

    Improve some basic styles

    oswaldoacauan committed May 20, 2016
  7. @oswaldoacauan

    Add basic nav-bar styles

    oswaldoacauan committed May 20, 2016
  8. @oswaldoacauan

    Improve Button styles

    oswaldoacauan committed May 20, 2016
  9. @oswaldoacauan
  10. @ritzalam

    Merge branch 'dfeng99-dfengBBB'

    ritzalam committed May 20, 2016
  11. @ritzalam

    Merge branch 'dfengBBB' of https://github.com/dfeng99/bigbluebutton i…

    …nto dfeng99-dfengBBB
    
    Conflicts:
    	bbb-common-message/build.sbt
    	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
    ritzalam committed May 20, 2016
  12. @ritzalam
  13. @ritzalam

    Merge branch 'bbb-web_fix-maxParticipants-by-tracking-joins' of https…

    …://github.com/jfederico/bigbluebutton into jfederico-bbb-web_fix-maxParticipants-by-tracking-joins
    
    Conflicts:
    	bigbluebutton-config/web/index.html
    ritzalam committed May 20, 2016
  14. @ritzalam
  15. @ritzalam

    Merge branch 'merge-v1.0.0-to-master' of https://github.com/ritzalam/…

    …bigbluebutton into ritzalam-merge-v1.0.0-to-master
    ritzalam committed May 20, 2016
  16. @ritzalam
  17. @ritzalam

    Merge branch 'responsive-playback' of https://github.com/daronco/bigb…

    …luebutton into daronco-responsive-playback
    ritzalam committed May 20, 2016
  18. @ritzalam
  19. @ritzalam

    Merge branch 'add-emojis' of https://github.com/delftswa2016/bigblueb…

    …utton into delftswa2016-add-emojis
    ritzalam committed May 20, 2016
Something went wrong with that request. Please try again.