Skip to content
Snippets Groups Projects
  1. Apr 19, 2014
  2. Apr 18, 2014
  3. Apr 17, 2014
  4. Apr 16, 2014
  5. Apr 15, 2014
  6. Apr 14, 2014
  7. Apr 13, 2014
  8. Apr 11, 2014
  9. Apr 10, 2014
  10. Apr 09, 2014
  11. Apr 08, 2014
    • Anton Georgiev's avatar
    • Richard Alam's avatar
      Merge branch 'merge-polling-with-master' into connect-bbb-apps-html5 · bee13204
      Richard Alam authored
      Conflicts:
      	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
      bee13204
    • Richard Alam's avatar
      - fix compile issues · 6ab5feb1
      Richard Alam authored
      6ab5feb1
    • Richard Alam's avatar
      - make bbb-apps compile · 3bd5840e
      Richard Alam authored
      3bd5840e
    • Anton Georgiev's avatar
      Merge branch 'addMsgLib' of /home/ubuntu/dev/antonHtml5/bigbluebutton into connect-bbb-apps-html5 · 2d89a73c
      Anton Georgiev authored
      Conflicts:
      	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
      	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
      	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatApplication.java
      	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatService.java
      	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
      	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingService.java
      	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/RedisMessagingService.java
      	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
      	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
      	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
      	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/ConversionUpdatesProcessor.java
      	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationApplication.java
      	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationService.java
      	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardApplication.java
      	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardService.java
      	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
      	bigbluebutton-web/grails-app/conf/UrlMappings.groovy
      	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
      	bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
      	bigbluebutton-web/ivy.xml
      	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
      	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
      	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
      	bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/SwfSlidesGenerationProgressNotifier.java
      2d89a73c
Loading