Merge remote-tracking branch 'upstream/OpenOLAT_12.5' (a7cf2c60) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit a7cf2c60 authored 6 years ago by User expired

Browse files

Merge remote-tracking branch 'upstream/OpenOLAT_12.5'

parents b2a51154 d23968db

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
src/main/java/de/bps/_spring/bpsContext.xml 1 addition, 3 deletions

src/main/java/de/bps/_spring/bpsContext.xml
src/main/java/org/olat/admin/UserAdminMainController.java 5 additions, 5 deletions

src/main/java/org/olat/admin/UserAdminMainController.java
src/main/java/org/olat/core/commons/services/license/ui/LicenseAdminConfigController.java 1 addition, 0 deletions

...ons/services/license/ui/LicenseAdminConfigController.java
src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeTableModel.java 10 additions, 12 deletions

.../assessment/ui/tool/IdentityListCourseNodeTableModel.java
src/main/java/org/olat/course/nodes/IQSELFCourseNode.java 2 additions, 3 deletions

src/main/java/org/olat/course/nodes/IQSELFCourseNode.java
src/main/java/org/olat/course/nodes/IQTESTCourseNode.java 30 additions, 18 deletions

src/main/java/org/olat/course/nodes/IQTESTCourseNode.java
src/main/java/org/olat/course/nodes/bc/BCCourseNodeEditController.java 9 additions, 9 deletions

.../org/olat/course/nodes/bc/BCCourseNodeEditController.java
src/main/java/org/olat/course/nodes/card2brain/Card2BrainConfigController.java 1 addition, 1 deletion

...t/course/nodes/card2brain/Card2BrainConfigController.java
src/main/java/org/olat/course/nodes/edubase/EdubaseBookSectionListController.java 1 addition, 1 deletion

...ourse/nodes/edubase/EdubaseBookSectionListController.java
src/main/java/org/olat/course/nodes/edubase/EdubaseConfigController.java 1 addition, 1 deletion

...rg/olat/course/nodes/edubase/EdubaseConfigController.java
src/main/java/org/olat/course/nodes/iq/IQConfigurationController.java 9 additions, 10 deletions

...a/org/olat/course/nodes/iq/IQConfigurationController.java
src/main/java/org/olat/course/nodes/iq/IQIdentityListCourseNodeController.java 1 addition, 2 deletions

...t/course/nodes/iq/IQIdentityListCourseNodeController.java
src/main/java/org/olat/course/nodes/iq/IQLayoutConfigurationController.java 1 addition, 3 deletions

...olat/course/nodes/iq/IQLayoutConfigurationController.java
src/main/java/org/olat/course/nodes/iq/QTIResourceTypeModule.java 13 additions, 30 deletions

.../java/org/olat/course/nodes/iq/QTIResourceTypeModule.java
src/main/java/org/olat/course/nodes/portfolio/PortfolioConfigForm.java 1 addition, 0 deletions

.../org/olat/course/nodes/portfolio/PortfolioConfigForm.java
src/main/java/org/olat/course/run/navigation/NavigationHandler.java 1 addition, 1 deletion

...ava/org/olat/course/run/navigation/NavigationHandler.java
src/main/java/org/olat/ims/qti/QTIPreWarm.java 2 additions, 3 deletions

src/main/java/org/olat/ims/qti/QTIPreWarm.java
src/main/java/org/olat/ims/qti/export/QTIArchiver.java 2 additions, 3 deletions

src/main/java/org/olat/ims/qti/export/QTIArchiver.java
src/main/java/org/olat/ims/qti/repository/handlers/QTISurveyHandler.java 4 additions, 5 deletions

...rg/olat/ims/qti/repository/handlers/QTISurveyHandler.java

with 96 additions and 110 deletions

Please register or to comment