Merge remote-tracking branch 'origin/OpenOLAT_14.2' (589631e6) · 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

589631e6

Commit 589631e6 authored 5 years ago by srosse

Downloads
- Plain Diff

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

parents 76d4478a 829e88fb

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/modules/video/manager/VideoNotificationsHandler.java 2 additions, 1 deletion

...olat/modules/video/manager/VideoNotificationsHandler.java
src/main/java/org/olat/modules/video/ui/VideoEntryDataSource.java 2 additions, 2 deletions

.../java/org/olat/modules/video/ui/VideoEntryDataSource.java
src/main/java/org/olat/modules/video/ui/VideoListingController.java 4 additions, 3 deletions

...ava/org/olat/modules/video/ui/VideoListingController.java
src/main/java/org/olat/repository/manager/RepositoryEntryMyCourseQueries.java 2 additions, 6 deletions

...at/repository/manager/RepositoryEntryMyCourseQueries.java
src/main/java/org/olat/repository/model/SearchMyRepositoryEntryViewParams.java 6 additions, 5 deletions

...t/repository/model/SearchMyRepositoryEntryViewParams.java
src/main/java/org/olat/repository/ui/catalog/CatalogNodeController.java 3 additions, 2 deletions

...org/olat/repository/ui/catalog/CatalogNodeController.java
src/main/java/org/olat/repository/ui/list/OverviewRepositoryListController.java 3 additions, 2 deletions

.../repository/ui/list/OverviewRepositoryListController.java
src/main/java/org/olat/repository/ui/list/RepositoryEntryListController.java 10 additions, 1 deletion

...lat/repository/ui/list/RepositoryEntryListController.java

with 32 additions and 22 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