Merge branch 'master' into learning_path
Conflicts: src/main/webapp/static/themes/light/theme.css src/main/webapp/static/themes/light/theme.css.map src/main/webapp/static/themes/openolat/theme.css src/main/webapp/static/themes/openolat/theme.css.map
No related branches found
No related tags found
Showing
- src/main/java/org/olat/admin/restapi/_content/rest.html 1 addition, 1 deletionsrc/main/java/org/olat/admin/restapi/_content/rest.html
- src/main/java/org/olat/commons/calendar/restapi/EventVO.java 12 additions, 0 deletionssrc/main/java/org/olat/commons/calendar/restapi/EventVO.java
- src/main/java/org/olat/core/commons/services/doceditor/ui/_content/editor_main.html 11 additions, 0 deletions...e/commons/services/doceditor/ui/_content/editor_main.html
- src/main/java/org/olat/core/commons/services/vfs/manager/VFSMetadataDAO.java 10 additions, 2 deletions...lat/core/commons/services/vfs/manager/VFSMetadataDAO.java
- src/main/java/org/olat/core/commons/services/vfs/manager/VFSRepositoryServiceImpl.java 26 additions, 7 deletions...ommons/services/vfs/manager/VFSRepositoryServiceImpl.java
- src/main/java/org/olat/core/commons/services/vfs/model/VFSMetadataFileSaved.java 10 additions, 0 deletions...core/commons/services/vfs/model/VFSMetadataFileSaved.java
- src/main/java/org/olat/core/commons/services/webdav/manager/WebDAVManagerImpl.java 11 additions, 0 deletions...re/commons/services/webdav/manager/WebDAVManagerImpl.java
- src/main/java/org/olat/course/nodes/bc/BCPeekviewController.java 4 additions, 1 deletion...n/java/org/olat/course/nodes/bc/BCPeekviewController.java
- src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementTypeVO.java 14 additions, 0 deletions...t/modules/curriculum/restapi/CurriculumElementTypeVO.java
- src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementVO.java 18 additions, 0 deletions.../olat/modules/curriculum/restapi/CurriculumElementVO.java
- src/main/java/org/olat/modules/curriculum/restapi/CurriculumVO.java 10 additions, 0 deletions...ava/org/olat/modules/curriculum/restapi/CurriculumVO.java
- src/main/java/org/olat/modules/lecture/manager/LectureBlockDAO.java 9 additions, 0 deletions...ava/org/olat/modules/lecture/manager/LectureBlockDAO.java
- src/main/java/org/olat/modules/lecture/restapi/LectureBlockVO.java 17 additions, 0 deletions...java/org/olat/modules/lecture/restapi/LectureBlockVO.java
- src/main/java/org/olat/modules/lecture/ui/wizard/InformStepController.java 1 addition, 1 deletion.../olat/modules/lecture/ui/wizard/InformStepController.java
- src/main/java/org/olat/modules/taxonomy/restapi/TaxonomyLevelTypeVO.java 14 additions, 0 deletions...rg/olat/modules/taxonomy/restapi/TaxonomyLevelTypeVO.java
- src/main/java/org/olat/modules/taxonomy/restapi/TaxonomyLevelVO.java 17 additions, 0 deletions...va/org/olat/modules/taxonomy/restapi/TaxonomyLevelVO.java
- src/main/java/org/olat/modules/taxonomy/restapi/TaxonomyVO.java 9 additions, 0 deletions...in/java/org/olat/modules/taxonomy/restapi/TaxonomyVO.java
- src/main/java/org/olat/modules/webFeed/ui/FeedFormController.java 6 additions, 9 deletions.../java/org/olat/modules/webFeed/ui/FeedFormController.java
- src/main/java/org/olat/modules/webFeed/ui/ItemFormController.java 1 addition, 0 deletions.../java/org/olat/modules/webFeed/ui/ItemFormController.java
- src/main/java/org/olat/modules/webFeed/ui/_i18n/LocalStrings_de.properties 2 additions, 0 deletions.../olat/modules/webFeed/ui/_i18n/LocalStrings_de.properties
Loading
Please register or sign in to comment