-
- Downloads
Merge branch 'master' into merging-fs-support
Conflicts: bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PublicScheduledSessionController.groovy
No related branches found
No related tags found
Showing
- bbb-api-examples/PHP/bbb_api.php 17 additions, 16 deletionsbbb-api-examples/PHP/bbb_api.php
- bigbluebutton-client/locale/es_LA/bbbResources.properties 184 additions, 158 deletionsbigbluebutton-client/locale/es_LA/bbbResources.properties
- bigbluebutton-client/locale/tr_TR/bbbResources.properties 27 additions, 7 deletionsbigbluebutton-client/locale/tr_TR/bbbResources.properties
- bigbluebutton-client/resources/config.xml.template 1 addition, 1 deletionbigbluebutton-client/resources/config.xml.template
- bigbluebutton-client/src/org/bigbluebutton/modules/present/views/PresentationWindow.mxml 2 additions, 0 deletions...gbluebutton/modules/present/views/PresentationWindow.mxml
- bigbluebutton-web/grails-app/conf/BootStrap.groovy 0 additions, 7 deletionsbigbluebutton-web/grails-app/conf/BootStrap.groovy
- bigbluebutton-web/grails-app/conf/DataSource.groovy 0 additions, 34 deletionsbigbluebutton-web/grails-app/conf/DataSource.groovy
- bigbluebutton-web/grails-app/conf/SecurityFilters.groovy 0 additions, 65 deletionsbigbluebutton-web/grails-app/conf/SecurityFilters.groovy
- bigbluebutton-web/grails-app/conf/UrlMappings.groovy 1 addition, 15 deletionsbigbluebutton-web/grails-app/conf/UrlMappings.groovy
- bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy 101 additions, 0 deletions...rs/org/bigbluebutton/web/controllers/ApiController.groovy
- bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/AuthController.groovy 0 additions, 115 deletions...s/org/bigbluebutton/web/controllers/AuthController.groovy
- bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ConferenceController.groovy 0 additions, 141 deletions...bigbluebutton/web/controllers/ConferenceController.groovy
- bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/JoinController.groovy 0 additions, 169 deletions...s/org/bigbluebutton/web/controllers/JoinController.groovy
- bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PortalController.groovy 0 additions, 300 deletions...org/bigbluebutton/web/controllers/PortalController.groovy
- bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PublicConferenceController.groovy 0 additions, 25 deletions...ebutton/web/controllers/PublicConferenceController.groovy
- bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PublicScheduledSessionController.groovy 0 additions, 317 deletions...n/web/controllers/PublicScheduledSessionController.groovy
- bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ScheduledSessionController.groovy 0 additions, 187 deletions...ebutton/web/controllers/ScheduledSessionController.groovy
- bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/UserController.groovy 0 additions, 144 deletions...s/org/bigbluebutton/web/controllers/UserController.groovy
- bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/Account.groovy 0 additions, 44 deletions...ls-app/domain/org/bigbluebutton/web/domain/Account.groovy
- bigbluebutton-web/grails-app/domain/org/bigbluebutton/web/domain/Conference.groovy 0 additions, 48 deletions...app/domain/org/bigbluebutton/web/domain/Conference.groovy
Loading
Please register or sign in to comment