Merge remote-tracking branch 'origin/OpenOLAT_15.2' (47626f3c) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 47626f3c authored 4 years ago by srosse

Browse files

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

parents 073690b9 13ab04df

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/basesecurity/BaseSecurityManager.java 8 additions, 2 deletions

src/main/java/org/olat/basesecurity/BaseSecurityManager.java
src/main/java/org/olat/basesecurity/IdentityImpl.hbm.xml 1 addition, 0 deletions

src/main/java/org/olat/basesecurity/IdentityImpl.hbm.xml
src/main/java/org/olat/basesecurity/IdentityImpl.java 9 additions, 0 deletions

src/main/java/org/olat/basesecurity/IdentityImpl.java
src/main/java/org/olat/core/commons/services/vfs/manager/VFSMetadataDAO.java 7 additions, 0 deletions

...lat/core/commons/services/vfs/manager/VFSMetadataDAO.java
src/main/java/org/olat/core/commons/services/vfs/manager/VFSRepositoryServiceImpl.java 48 additions, 25 deletions

...ommons/services/vfs/manager/VFSRepositoryServiceImpl.java
src/main/java/org/olat/core/commons/services/vfs/manager/VFSRevisionDAO.java 14 additions, 0 deletions

...lat/core/commons/services/vfs/manager/VFSRevisionDAO.java
src/main/java/org/olat/core/commons/services/vfs/model/VFSMetadataImpl.java 2 additions, 0 deletions

...olat/core/commons/services/vfs/model/VFSMetadataImpl.java
src/main/java/org/olat/core/util/vfs/LocalFileImpl.java 1 addition, 1 deletion

src/main/java/org/olat/core/util/vfs/LocalFileImpl.java
src/main/java/org/olat/course/CourseFactory.java 3 additions, 0 deletions

src/main/java/org/olat/course/CourseFactory.java
src/main/java/org/olat/course/nodes/gta/ui/AbstractAssignmentEditController.java 1 addition, 0 deletions

...course/nodes/gta/ui/AbstractAssignmentEditController.java
src/main/java/org/olat/course/nodes/gta/ui/DirectoryController.java 1 addition, 0 deletions

...ava/org/olat/course/nodes/gta/ui/DirectoryController.java
src/main/java/org/olat/course/nodes/gta/ui/GTAAssignedTaskController.java 1 addition, 0 deletions

...g/olat/course/nodes/gta/ui/GTAAssignedTaskController.java
src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

...olat/course/nodes/gta/ui/_i18n/LocalStrings_de.properties
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/nodes/gta/ui/_i18n/LocalStrings_fr.properties 1 addition, 1 deletion

...olat/course/nodes/gta/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_it.properties 1 addition, 1 deletion

...olat/course/nodes/gta/ui/_i18n/LocalStrings_it.properties
src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_pt_BR.properties 1 addition, 1 deletion

...t/course/nodes/gta/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/upgrade/_spring/databaseUpgradeContext.xml 4 additions, 0 deletions

.../java/org/olat/upgrade/_spring/databaseUpgradeContext.xml
src/main/java/org/olat/user/manager/lifecycle/UserLifecycleManagerImpl.java 11 additions, 7 deletions

...olat/user/manager/lifecycle/UserLifecycleManagerImpl.java
src/main/resources/database/mysql/alter_15_2_x_to_15_2_3.sql 3 additions, 0 deletions

src/main/resources/database/mysql/alter_15_2_x_to_15_2_3.sql

with 119 additions and 40 deletions

Please register or to comment