Merge branch 'OpenOLAT_14.1'
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/course/nodes/ms/MSStatisticController.java 2 additions, 1 deletion.../java/org/olat/course/nodes/ms/MSStatisticController.java
- src/main/java/org/olat/ims/qti21/ui/components/AssessmentTreeComponentRenderer.java 5 additions, 1 deletion.../qti21/ui/components/AssessmentTreeComponentRenderer.java
- src/main/java/org/olat/modules/forms/EvaluationFormManager.java 9 additions, 0 deletions...in/java/org/olat/modules/forms/EvaluationFormManager.java
- src/main/java/org/olat/modules/forms/manager/EvaluationFormManagerImpl.java 32 additions, 0 deletions...olat/modules/forms/manager/EvaluationFormManagerImpl.java
- src/main/java/org/olat/modules/forms/ui/EvaluationFormExcelExport.java 2 additions, 1 deletion.../org/olat/modules/forms/ui/EvaluationFormExcelExport.java
- src/main/java/org/olat/modules/forms/ui/EvaluationFormReportController.java 7 additions, 1 deletion...olat/modules/forms/ui/EvaluationFormReportController.java
- src/main/java/org/olat/modules/quality/analysis/ui/GroupByController.java 5 additions, 1 deletion...g/olat/modules/quality/analysis/ui/GroupByController.java
- src/main/webapp/static/themes/light/modules/_qti21.scss 1 addition, 0 deletionssrc/main/webapp/static/themes/light/modules/_qti21.scss
- src/main/webapp/static/themes/light/theme.css 1 addition, 1 deletionsrc/main/webapp/static/themes/light/theme.css
- src/main/webapp/static/themes/light/theme.css.map 1 addition, 1 deletionsrc/main/webapp/static/themes/light/theme.css.map
- src/main/webapp/static/themes/openolat/theme.css 1 addition, 1 deletionsrc/main/webapp/static/themes/openolat/theme.css
- src/main/webapp/static/themes/openolat/theme.css.map 1 addition, 1 deletionsrc/main/webapp/static/themes/openolat/theme.css.map
Loading
Please register or sign in to comment