Merge remote-tracking branch 'origin/OpenOLAT_15.2' (075f2038) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 075f2038 authored 4 years ago by srosse

Browse files

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

parents 6fa9690d 9b7eae69

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/core/commons/fullWebApp/BaseFullWebappController.java 4 additions, 37 deletions

...lat/core/commons/fullWebApp/BaseFullWebappController.java
src/main/java/org/olat/core/gui/control/winmgr/CommandFactory.java 6 additions, 1 deletion

...java/org/olat/core/gui/control/winmgr/CommandFactory.java
src/main/java/org/olat/course/nodes/ProjectBrokerCourseNode.java 4 additions, 13 deletions

...n/java/org/olat/course/nodes/ProjectBrokerCourseNode.java
src/main/java/org/olat/course/nodes/cl/ui/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

.../olat/course/nodes/cl/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/nodes/gta/manager/GTAManagerImpl.java 16 additions, 0 deletions

...ava/org/olat/course/nodes/gta/manager/GTAManagerImpl.java
src/main/java/org/olat/course/nodes/gta/model/TaskDefinition.java 11 additions, 0 deletions

.../java/org/olat/course/nodes/gta/model/TaskDefinition.java
src/main/java/org/olat/course/nodes/iq/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

...org/olat/course/nodes/iq/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/nodes/ms/_i18n/LocalStrings_de.properties 31 additions, 31 deletions

...org/olat/course/nodes/ms/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/nodes/projectbroker/ProjectBrokerControllerFactory.java 2 additions, 7 deletions

...e/nodes/projectbroker/ProjectBrokerControllerFactory.java
src/main/java/org/olat/course/nodes/projectbroker/ProjectListController.java 3 additions, 4 deletions

...lat/course/nodes/projectbroker/ProjectListController.java
src/main/java/org/olat/dispatcher/DMZDispatcher.java 2 additions, 2 deletions

src/main/java/org/olat/dispatcher/DMZDispatcher.java
src/main/java/org/olat/ims/qti21/ui/components/_content/choiceInteraction.html 2 additions, 2 deletions

...t/ims/qti21/ui/components/_content/choiceInteraction.html
src/main/java/org/olat/user/ui/admin/UserSearchTableController.java 3 additions, 1 deletion

...ava/org/olat/user/ui/admin/UserSearchTableController.java
src/main/webapp/static/themes/light/modules/_qti21.scss 0 additions, 4 deletions

src/main/webapp/static/themes/light/modules/_qti21.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/selenium/UserTest.java 2 additions, 0 deletions

src/test/java/org/olat/selenium/UserTest.java
src/test/java/org/olat/selenium/page/course/CourseEditorPageFragment.java 17 additions, 9 deletions

...g/olat/selenium/page/course/CourseEditorPageFragment.java

with 109 additions and 117 deletions

Please register or to comment