Merge OpenOLAT 11.1 to OpenOLAT default branch with 7554cb329aea7a098d151bad5fef8014b6b7d566 (110aab4d) · 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

110aab4d

Commit 110aab4d authored 8 years ago by srosse

Downloads
- Plain Diff

Merge OpenOLAT 11.1 to OpenOLAT default branch with 7554cb329aea7a098d151bad5fef8014b6b7d566

parents b79e4ef5 8fcd3d00

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/admin/user/imp/UserImportController.java 1 addition, 1 deletion

...in/java/org/olat/admin/user/imp/UserImportController.java
src/main/java/org/olat/basesecurity/BaseSecurity.java 2 additions, 0 deletions

src/main/java/org/olat/basesecurity/BaseSecurity.java
src/main/java/org/olat/basesecurity/BaseSecurityManager.java 21 additions, 0 deletions

src/main/java/org/olat/basesecurity/BaseSecurityManager.java
src/main/java/org/olat/course/member/wizard/ImportMemberOverviewIdentitiesController.java 1 addition, 1 deletion

...mber/wizard/ImportMemberOverviewIdentitiesController.java
src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_it.properties 28 additions, 1 deletion

...va/org/olat/ims/qti21/ui/_i18n/LocalStrings_it.properties
src/main/java/org/olat/modules/portfolio/ui/wizard/MembersOverviewIdentitiesController.java 1 addition, 1 deletion

...tfolio/ui/wizard/MembersOverviewIdentitiesController.java
src/main/java/org/olat/search/ui/_i18n/LocalStrings_it.properties 7 additions, 59 deletions

.../java/org/olat/search/ui/_i18n/LocalStrings_it.properties
src/test/java/org/olat/basesecurity/BaseSecurityManagerTest.java 25 additions, 0 deletions

...t/java/org/olat/basesecurity/BaseSecurityManagerTest.java

with 86 additions and 63 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