Merge branch 'OpenOLAT_14.1' (aef92835) · 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

aef92835

Commit aef92835 authored 5 years ago by uhensler

Downloads
- Plain Diff

Merge branch 'OpenOLAT_14.1'

Conflicts:
	src/main/java/org/olat/upgrade/_spring/databaseUpgradeContext.xml

parents 47e3c807 52e4a021

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/ims/qti21/manager/QTI21StatisticsManagerImpl.java 10 additions, 3 deletions

...rg/olat/ims/qti21/manager/QTI21StatisticsManagerImpl.java
src/main/java/org/olat/modules/forms/ui/TextInputController.java 13 additions, 4 deletions

...n/java/org/olat/modules/forms/ui/TextInputController.java
src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

...rg/olat/modules/forms/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

...rg/olat/modules/forms/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/upgrade/_spring/databaseUpgradeContext.xml 4 additions, 0 deletions

.../java/org/olat/upgrade/_spring/databaseUpgradeContext.xml
src/main/resources/database/mysql/alter_14_1_x_to_14_1_6.sql 2 additions, 0 deletions

src/main/resources/database/mysql/alter_14_1_x_to_14_1_6.sql
src/main/resources/database/mysql/setupDatabase.sql 1 addition, 1 deletion

src/main/resources/database/mysql/setupDatabase.sql
src/main/resources/database/oracle/alter_14_1_x_to_14_1_6.sql 2 additions, 0 deletions

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

.../resources/database/postgresql/alter_14_1_x_to_14_1_6.sql

with 36 additions and 8 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