Merge remote-tracking branch 'origin/OpenOLAT_13.2' (5f767089) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 5f767089 authored 6 years ago by srosse

Browse files

Merge remote-tracking branch 'origin/OpenOLAT_13.2'

parents f7491df3 8c8a6b64

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/commons/calendar/ui/components/FullCalendarMapper.java 22 additions, 4 deletions

...at/commons/calendar/ui/components/FullCalendarMapper.java
src/main/java/org/olat/ims/qti21/ui/AssessmentTestDisplayController.java 3 additions, 1 deletion

...rg/olat/ims/qti21/ui/AssessmentTestDisplayController.java
src/main/java/org/olat/ims/qti21/ui/_content/assessment_results.html 2 additions, 4 deletions

...va/org/olat/ims/qti21/ui/_content/assessment_results.html
src/main/java/org/olat/ims/qti21/ui/assessment/CorrectionIdentityInteractionsController.java 6 additions, 6 deletions

.../assessment/CorrectionIdentityInteractionsController.java
src/main/java/org/olat/ims/qti21/ui/components/AssessmentObjectComponent.java 10 additions, 1 deletion

...at/ims/qti21/ui/components/AssessmentObjectComponent.java
src/main/java/org/olat/ims/qti21/ui/components/AssessmentObjectComponentRenderer.java 1 addition, 0 deletions

...ti21/ui/components/AssessmentObjectComponentRenderer.java
src/main/java/org/olat/ims/qti21/ui/components/AssessmentObjectFormItem.java 8 additions, 0 deletions

...lat/ims/qti21/ui/components/AssessmentObjectFormItem.java
src/main/java/org/olat/ims/qti21/ui/components/AssessmentObjectVelocityRenderDecorator.java 19 additions, 2 deletions

...i/components/AssessmentObjectVelocityRenderDecorator.java
src/main/java/org/olat/ims/qti21/ui/components/AssessmentTestFormItem.java 8 additions, 0 deletions

.../olat/ims/qti21/ui/components/AssessmentTestFormItem.java
src/main/java/org/olat/ims/qti21/ui/components/_content/textEntryInteraction.html 1 addition, 0 deletions

...ms/qti21/ui/components/_content/textEntryInteraction.html
src/main/java/org/olat/modules/curriculum/CurriculumService.java 10 additions, 0 deletions

...n/java/org/olat/modules/curriculum/CurriculumService.java
src/main/java/org/olat/modules/curriculum/manager/CurriculumElementDAO.java 37 additions, 5 deletions

...olat/modules/curriculum/manager/CurriculumElementDAO.java
src/main/java/org/olat/modules/curriculum/manager/CurriculumServiceImpl.java 7 additions, 0 deletions

...lat/modules/curriculum/manager/CurriculumServiceImpl.java
src/main/java/org/olat/modules/curriculum/restapi/CurriculumElementsWebService.java 11 additions, 1 deletion

...ules/curriculum/restapi/CurriculumElementsWebService.java
src/main/webapp/static/themes/light/modules/_icons.scss 2 additions, 0 deletions

src/main/webapp/static/themes/light/modules/_icons.scss
src/main/webapp/static/themes/light/theme.css 1 addition, 1 deletion

src/main/webapp/static/themes/light/theme.css
src/main/webapp/static/themes/light/theme.css.map 1 addition, 1 deletion

src/main/webapp/static/themes/light/theme.css.map
src/main/webapp/static/themes/openolat/theme.css 1 addition, 1 deletion

src/main/webapp/static/themes/openolat/theme.css
src/main/webapp/static/themes/openolat/theme.css.map 1 addition, 1 deletion

src/main/webapp/static/themes/openolat/theme.css.map
src/test/java/org/olat/modules/curriculum/manager/CurriculumElementDAOTest.java 101 additions, 0 deletions

.../modules/curriculum/manager/CurriculumElementDAOTest.java

with 252 additions and 28 deletions

Please register or to comment