Merge OpenOLAT 10.0 to OpenOLAT default branch with 56c540022f6fa718b88292bd712f911c463fc7e2 (ee4cee63) · 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

ee4cee63

Commit ee4cee63 authored 10 years ago by srosse

Downloads
- Plain Diff

Merge OpenOLAT 10.0 to OpenOLAT default branch with 56c540022f6fa718b88292bd712f911c463fc7e2

parents 6cb3a153 c4072f05

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/course/nodes/feed/FeedPeekviewController.java 41 additions, 33 deletions

...va/org/olat/course/nodes/feed/FeedPeekviewController.java
src/main/java/org/olat/course/nodes/feed/_content/peekview.html 5 additions, 0 deletions

...in/java/org/olat/course/nodes/feed/_content/peekview.html
src/main/java/org/olat/course/nodes/feed/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

...g/olat/course/nodes/feed/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/webFeed/_spring/webFeedContext.xml 1 addition, 1 deletion

.../java/org/olat/modules/webFeed/_spring/webFeedContext.xml
src/main/java/org/olat/modules/webFeed/ui/FeedMainController.java 26 additions, 20 deletions

.../java/org/olat/modules/webFeed/ui/FeedMainController.java
src/main/java/org/olat/modules/webFeed/ui/_content/feed_error.html 3 additions, 0 deletions

...java/org/olat/modules/webFeed/ui/_content/feed_error.html
src/main/java/org/olat/modules/webFeed/ui/_i18n/LocalStrings_de.properties 2 additions, 1 deletion

.../olat/modules/webFeed/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/repository/ui/author/AuthorListController.java 10 additions, 2 deletions

...a/org/olat/repository/ui/author/AuthorListController.java
src/main/java/org/olat/repository/ui/author/ImportRepositoryEntryController.java 17 additions, 10 deletions

...repository/ui/author/ImportRepositoryEntryController.java

with 106 additions and 68 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