Merge remote-tracking branch 'origin/OpenOLAT_14.1' (6ccc7753) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

OLAT CI-CD Testing Project
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

6ccc7753

Commit 6ccc7753 authored 5 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_14.1'

parents a873acf8 b0101dbd

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/commons/services/vfs/ui/version/DeletedFileListController.java 1 addition, 1 deletion

...ns/services/vfs/ui/version/DeletedFileListController.java
src/main/java/org/olat/course/nodes/BCCourseNode.java 1 addition, 1 deletion

src/main/java/org/olat/course/nodes/BCCourseNode.java
src/main/java/org/olat/course/nodes/bc/BCCourseNodeEditController.java 23 additions, 17 deletions

.../org/olat/course/nodes/bc/BCCourseNodeEditController.java
src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_en.properties 1 addition, 1 deletion

...olat/course/nodes/gta/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/run/scoring/ScoreAccounting.java 1 addition, 1 deletion

...ain/java/org/olat/course/run/scoring/ScoreAccounting.java
src/main/java/org/olat/modules/webFeed/FeedViewHelper.java 6 additions, 13 deletions

src/main/java/org/olat/modules/webFeed/FeedViewHelper.java
src/main/java/org/olat/modules/webFeed/dispatching/FeedMediaDispatcher.java 4 additions, 4 deletions

...olat/modules/webFeed/dispatching/FeedMediaDispatcher.java
src/main/java/org/olat/modules/webFeed/dispatching/Path.java 2 additions, 4 deletions

src/main/java/org/olat/modules/webFeed/dispatching/Path.java
src/main/java/org/olat/modules/webFeed/ui/podcast/_content/info.html 2 additions, 2 deletions

...va/org/olat/modules/webFeed/ui/podcast/_content/info.html
src/test/java/org/olat/modules/webFeed/dispatching/PathTest.java 94 additions, 0 deletions

...t/java/org/olat/modules/webFeed/dispatching/PathTest.java
src/test/java/org/olat/test/AllTestsJunit4.java 1 addition, 0 deletions

src/test/java/org/olat/test/AllTestsJunit4.java

with 136 additions and 44 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment