-
- Downloads
Merge remote-tracking branch 'bigbluebutton/master' into mobile-ui-updates
# Conflicts: # clients/flash/air-client/src/org/bigbluebutton/air/main/views/MenuButtons.as
Showing
- bbb-common-web/src/main/java/org/bigbluebutton/presentation/PngCreator.java 23 additions, 0 deletions.../main/java/org/bigbluebutton/presentation/PngCreator.java
- bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java 24 additions, 10 deletions...ton/presentation/imp/PdfToSwfSlidesGenerationService.java
- bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PngCreatorImp.java 173 additions, 0 deletions...ava/org/bigbluebutton/presentation/imp/PngCreatorImp.java
- bigbluebutton-web/grails-app/conf/UrlMappings.groovy 4 additions, 0 deletionsbigbluebutton-web/grails-app/conf/UrlMappings.groovy
- bigbluebutton-web/grails-app/conf/bigbluebutton.properties 7 additions, 0 deletionsbigbluebutton-web/grails-app/conf/bigbluebutton.properties
- bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml 7 additions, 0 deletionsbigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
- bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PresentationController.groovy 24 additions, 1 deletion...gbluebutton/web/controllers/PresentationController.groovy
- bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy 8 additions, 0 deletions...org/bigbluebutton/web/services/PresentationService.groovy
- clients/flash/air-client/src/Default.css 1 addition, 2 deletionsclients/flash/air-client/src/Default.css
- clients/flash/air-client/src/css/hdpi.css 6 additions, 13 deletionsclients/flash/air-client/src/css/hdpi.css
- clients/flash/air-client/src/css/ldpi.css 5 additions, 12 deletionsclients/flash/air-client/src/css/ldpi.css
- clients/flash/air-client/src/css/mdpi.css 5 additions, 12 deletionsclients/flash/air-client/src/css/mdpi.css
- clients/flash/air-client/src/css/xhdpi.css 5 additions, 12 deletionsclients/flash/air-client/src/css/xhdpi.css
- clients/flash/air-client/src/css/xxhdpi.css 5 additions, 12 deletionsclients/flash/air-client/src/css/xxhdpi.css
- clients/flash/air-client/src/css/xxxhdpi.css 5 additions, 12 deletionsclients/flash/air-client/src/css/xxxhdpi.css
- clients/flash/air-client/src/org/bigbluebutton/air/chat/views/skins/SendButtonSkin.mxml 1 addition, 0 deletions...rg/bigbluebutton/air/chat/views/skins/SendButtonSkin.mxml
- clients/flash/air-client/src/org/bigbluebutton/air/main/views/MenuButtons.as 3 additions, 5 deletions...lient/src/org/bigbluebutton/air/main/views/MenuButtons.as
- clients/flash/air-client/src/org/bigbluebutton/air/main/views/MenuButtonsMediator.as 0 additions, 7 deletions...c/org/bigbluebutton/air/main/views/MenuButtonsMediator.as
- clients/flash/air-client/src/org/bigbluebutton/air/main/views/skins/MenuButtonSkin.mxml 0 additions, 6 deletions...rg/bigbluebutton/air/main/views/skins/MenuButtonSkin.mxml
- clients/flash/air-client/src/org/bigbluebutton/air/presentation/models/Slide.as 6 additions, 1 deletion...nt/src/org/bigbluebutton/air/presentation/models/Slide.as
Loading
Please register or sign in to comment