Merge OpenOLAT 10.5 to OpenOLAT default branch with 2be076f27f2681273cc1cc3f64a63c6a1c73d366 (998ab6fb) · 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

998ab6fb

Commit 998ab6fb authored 8 years ago by srosse

Downloads
- Plain Diff

Merge OpenOLAT 10.5 to OpenOLAT default branch with 2be076f27f2681273cc1cc3f64a63c6a1c73d366

parents 0b9da5b9 3c58418d

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/course/nodes/video/_content/edit.html 1 addition, 2 deletions

src/main/java/org/olat/course/nodes/video/_content/edit.html
src/main/java/org/olat/modules/video/ui/VideoQualityTableFormController.java 1 addition, 1 deletion

...lat/modules/video/ui/VideoQualityTableFormController.java
src/main/java/org/olat/modules/video/ui/VideoTrackEditController.java 1 addition, 1 deletion

...a/org/olat/modules/video/ui/VideoTrackEditController.java
src/main/java/org/olat/resource/accesscontrol/manager/ACMethodDAO.java 8 additions, 2 deletions

.../org/olat/resource/accesscontrol/manager/ACMethodDAO.java
src/main/java/org/olat/resource/accesscontrol/provider/paypal/manager/PaypalManagerImpl.java 2 additions, 0 deletions

...esscontrol/provider/paypal/manager/PaypalManagerImpl.java
src/main/resources/database/mysql/alter_10_5_4_to_10_5_5.sql 4 additions, 1 deletion

src/main/resources/database/mysql/alter_10_5_4_to_10_5_5.sql
src/main/resources/database/oracle/alter_10_5_4_to_10_5_5.sql 3 additions, 0 deletions

...main/resources/database/oracle/alter_10_5_4_to_10_5_5.sql
src/main/resources/database/postgresql/alter_10_5_4_to_10_5_5.sql 2 additions, 0 deletions

.../resources/database/postgresql/alter_10_5_4_to_10_5_5.sql

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