Merge branch 'OpenOLAT_14.1' of... (ff37e8eb) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit ff37e8eb authored 5 years ago by srosse

Merge branch 'OpenOLAT_14.1' of...

Merge branch 'OpenOLAT_14.1' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git into OpenOLAT_14.1

parents 73087053 35b2c449

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/course/nodes/bc/_content/folder.html 1 addition, 1 deletion

src/main/java/org/olat/course/nodes/bc/_content/folder.html
src/main/java/org/olat/course/nodes/cp/CPEditController.java 3 additions, 5 deletions

src/main/java/org/olat/course/nodes/cp/CPEditController.java
src/main/java/org/olat/course/nodes/feed/FeedNodeEditController.java 8 additions, 6 deletions

...va/org/olat/course/nodes/feed/FeedNodeEditController.java
src/main/java/org/olat/course/nodes/feed/_content/edit.html 1 addition, 1 deletion

src/main/java/org/olat/course/nodes/feed/_content/edit.html
src/main/java/org/olat/course/nodes/feed/blog/BlogNodeEditController.java 4 additions, 12 deletions

...g/olat/course/nodes/feed/blog/BlogNodeEditController.java
src/main/java/org/olat/course/nodes/feed/podcast/PodcastNodeEditController.java 4 additions, 12 deletions

.../course/nodes/feed/podcast/PodcastNodeEditController.java
src/main/java/org/olat/course/nodes/gta/ui/GTAEditController.java 7 additions, 2 deletions

.../java/org/olat/course/nodes/gta/ui/GTAEditController.java
src/main/java/org/olat/course/nodes/gta/ui/GTARevisionAndCorrectionEditController.java 1 addition, 1 deletion

.../nodes/gta/ui/GTARevisionAndCorrectionEditController.java
src/main/java/org/olat/course/nodes/gta/ui/GTASampleSolutionsEditController.java 0 additions, 1 deletion

...course/nodes/gta/ui/GTASampleSolutionsEditController.java
src/main/java/org/olat/course/nodes/gta/ui/GTASubmissionEditController.java 1 addition, 1 deletion

...olat/course/nodes/gta/ui/GTASubmissionEditController.java
src/main/java/org/olat/course/nodes/gta/ui/GTAWorkflowEditController.java 1 addition, 1 deletion

...g/olat/course/nodes/gta/ui/GTAWorkflowEditController.java
src/main/java/org/olat/course/nodes/gta/ui/_content/edit_solution_list.html 1 addition, 1 deletion

...olat/course/nodes/gta/ui/_content/edit_solution_list.html
src/main/java/org/olat/course/nodes/gta/ui/_content/edit_task_list.html 1 addition, 1 deletion

...org/olat/course/nodes/gta/ui/_content/edit_task_list.html
src/main/java/org/olat/course/nodes/iq/_content/edit.html 1 addition, 1 deletion

src/main/java/org/olat/course/nodes/iq/_content/edit.html
src/main/java/org/olat/course/nodes/ms/MSEditFormController.java 18 additions, 7 deletions

...n/java/org/olat/course/nodes/ms/MSEditFormController.java
src/main/java/org/olat/course/nodes/ms/_content/edit.html 1 addition, 1 deletion

src/main/java/org/olat/course/nodes/ms/_content/edit.html
src/main/java/org/olat/course/nodes/ms/_i18n/LocalStrings_de.properties 31 additions, 30 deletions

...org/olat/course/nodes/ms/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/nodes/ms/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

...org/olat/course/nodes/ms/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/nodes/portfolio/PortfolioCourseNodeEditController.java 1 addition, 1 deletion

...se/nodes/portfolio/PortfolioCourseNodeEditController.java
src/main/java/org/olat/course/nodes/scorm/ScormEditController.java 6 additions, 1 deletion

...java/org/olat/course/nodes/scorm/ScormEditController.java

with 92 additions and 86 deletions

Please register or to comment