Merge branch 'master' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git (174f17eb) · 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

174f17eb

Commit 174f17eb authored 5 years ago by srosse

Downloads
- Plain Diff

Merge branch 'master' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git

parents 94103761 eb1ec2ef

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/assessment/ui/mode/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

...ourse/assessment/ui/mode/_i18n/LocalStrings_de.properties
src/main/java/org/olat/ldap/manager/LDAPLoginManagerImpl.java 0 additions, 1 deletion

...main/java/org/olat/ldap/manager/LDAPLoginManagerImpl.java
src/main/java/org/olat/ldap/ui/LDAPAdminController.java 74 additions, 94 deletions

src/main/java/org/olat/ldap/ui/LDAPAdminController.java
src/main/java/org/olat/modules/lecture/ui/LectureRepositorySettingsController.java 33 additions, 0 deletions

...dules/lecture/ui/LectureRepositorySettingsController.java
src/main/java/org/olat/user/propertyhandlers/SmsPhonePropertyHandler.java 1 addition, 1 deletion

...g/olat/user/propertyhandlers/SmsPhonePropertyHandler.java
src/main/java/org/olat/user/propertyhandlers/UserInterestsPropertyHandler.java 1 addition, 1 deletion

...t/user/propertyhandlers/UserInterestsPropertyHandler.java
src/main/java/org/olat/user/ui/role/RelationRolesAndRightsUIFactory.java 2 additions, 1 deletion

...rg/olat/user/ui/role/RelationRolesAndRightsUIFactory.java
src/main/webapp/static/js/jquery/openolat/jquery.drawing.js 0 additions, 2 deletions

src/main/webapp/static/js/jquery/openolat/jquery.drawing.js

with 112 additions and 101 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