Merge branch 'OpenOLAT_13.2'
Conflicts: src/main/java/org/olat/core/dispatcher/mapper/MapperDispatcher.java src/main/java/org/olat/modules/forms/model/jpa/RubricStatisticImpl.java src/test/java/org/olat/selenium/page/qti/QTI21Page.java
No related branches found
No related tags found
Showing
- src/main/java/org/olat/core/dispatcher/mapper/MapperDispatcher.java 4 additions, 3 deletions...ava/org/olat/core/dispatcher/mapper/MapperDispatcher.java
- src/main/java/org/olat/core/gui/components/form/flexible/impl/Form.java 10 additions, 6 deletions...org/olat/core/gui/components/form/flexible/impl/Form.java
- src/main/java/org/olat/course/editor/MultiSPController.java 27 additions, 3 deletionssrc/main/java/org/olat/course/editor/MultiSPController.java
- src/main/java/org/olat/ims/qti21/ui/_content/assessment_results.html 8 additions, 0 deletions...va/org/olat/ims/qti21/ui/_content/assessment_results.html
- src/main/java/org/olat/modules/forms/model/jpa/RubricStatisticImpl.java 10 additions, 21 deletions...org/olat/modules/forms/model/jpa/RubricStatisticImpl.java
- src/main/java/org/olat/modules/forms/ui/EvaluationFormExecutionController.java 5 additions, 9 deletions...t/modules/forms/ui/EvaluationFormExecutionController.java
- src/main/java/org/olat/modules/forms/ui/TextInputController.java 2 additions, 2 deletions...n/java/org/olat/modules/forms/ui/TextInputController.java
Loading
Please register or sign in to comment