Merge branch 'master' into learning_path
Conflicts: src/main/java/org/olat/course/nodes/ms/_i18n/LocalStrings_de.properties src/main/java/org/olat/course/nodes/scorm/ScormEditController.java src/main/java/org/olat/course/nodes/survey/_i18n/LocalStrings_pt_BR.properties src/main/java/org/olat/upgrade/_spring/databaseUpgradeContext.xml
Showing
- pom.xml 12 additions, 12 deletionspom.xml
- scripts/version-rules.xml 1 addition, 1 deletionscripts/version-rules.xml
- src/main/java/org/olat/admin/registration/SystemRegistrationManager.java 2 additions, 0 deletions...rg/olat/admin/registration/SystemRegistrationManager.java
- src/main/java/org/olat/admin/restapi/RestapiAdminController.java 0 additions, 2 deletions...n/java/org/olat/admin/restapi/RestapiAdminController.java
- src/main/java/org/olat/admin/restapi/_content/docLink.html 2 additions, 1 deletionsrc/main/java/org/olat/admin/restapi/_content/docLink.html
- src/main/java/org/olat/admin/restapi/_i18n/LocalStrings_de.properties 2 additions, 2 deletions...a/org/olat/admin/restapi/_i18n/LocalStrings_de.properties
- src/main/java/org/olat/admin/restapi/_i18n/LocalStrings_en.properties 2 additions, 2 deletions...a/org/olat/admin/restapi/_i18n/LocalStrings_en.properties
- src/main/java/org/olat/admin/restapi/_i18n/LocalStrings_fr.properties 2 additions, 2 deletions...a/org/olat/admin/restapi/_i18n/LocalStrings_fr.properties
- src/main/java/org/olat/admin/restapi/_i18n/LocalStrings_pt_BR.properties 2 additions, 2 deletions...rg/olat/admin/restapi/_i18n/LocalStrings_pt_BR.properties
- src/main/java/org/olat/admin/user/tools/UserToolsModule.java 2 additions, 4 deletionssrc/main/java/org/olat/admin/user/tools/UserToolsModule.java
- src/main/java/org/olat/basesecurity/OrganisationService.java 6 additions, 0 deletionssrc/main/java/org/olat/basesecurity/OrganisationService.java
- src/main/java/org/olat/basesecurity/manager/OrganisationDAO.java 10 additions, 0 deletions...n/java/org/olat/basesecurity/manager/OrganisationDAO.java
- src/main/java/org/olat/basesecurity/manager/OrganisationServiceImpl.java 6 additions, 0 deletions...rg/olat/basesecurity/manager/OrganisationServiceImpl.java
- src/main/java/org/olat/commons/info/manager/InfoMessageFrontendManagerImpl.java 16 additions, 14 deletions.../commons/info/manager/InfoMessageFrontendManagerImpl.java
- src/main/java/org/olat/core/commons/controllers/resume/ResumeController.java 1 addition, 4 deletions...lat/core/commons/controllers/resume/ResumeController.java
- src/main/java/org/olat/core/commons/fullWebApp/LayoutMain3ColsController.java 35 additions, 31 deletions...at/core/commons/fullWebApp/LayoutMain3ColsController.java
- src/main/java/org/olat/core/commons/fullWebApp/_content/main_3cols.html 2 additions, 4 deletions...org/olat/core/commons/fullWebApp/_content/main_3cols.html
- src/main/java/org/olat/core/commons/modules/bc/FileUploadController.java 4 additions, 2 deletions...rg/olat/core/commons/modules/bc/FileUploadController.java
- src/main/java/org/olat/core/commons/modules/bc/_i18n/LocalStrings_de.properties 1 addition, 0 deletions.../core/commons/modules/bc/_i18n/LocalStrings_de.properties
- src/main/java/org/olat/core/commons/modules/bc/_i18n/LocalStrings_en.properties 1 addition, 0 deletions.../core/commons/modules/bc/_i18n/LocalStrings_en.properties
Loading
Please register or sign in to comment