Merge OpenOLAT 10.2 to OpenOLAT default branch with e3f33576a555c0037216c1efa772263eb511e5d0 (191e7c5b) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 191e7c5b authored 9 years ago by srosse

Browse files

Merge OpenOLAT 10.2 to OpenOLAT default branch with e3f33576a555c0037216c1efa772263eb511e5d0

parents e7544875 f02f287e

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/admin/user/SystemRolesAndRightsForm.java 7 additions, 2 deletions

...in/java/org/olat/admin/user/SystemRolesAndRightsForm.java
src/main/java/org/olat/core/commons/modules/bc/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

.../core/commons/modules/bc/_i18n/LocalStrings_de.properties
src/main/java/org/olat/core/gui/control/navigation/callback/AdminSecurityCallback.java 3 additions, 5 deletions

...ui/control/navigation/callback/AdminSecurityCallback.java
src/main/java/org/olat/course/assessment/AssessmentModeManager.java 24 additions, 0 deletions

...ava/org/olat/course/assessment/AssessmentModeManager.java
src/main/java/org/olat/course/assessment/manager/AssessmentModeManagerImpl.java 27 additions, 1 deletion

.../course/assessment/manager/AssessmentModeManagerImpl.java
src/main/java/org/olat/course/assessment/ui/AssessmentModeEditController.java 6 additions, 3 deletions

...at/course/assessment/ui/AssessmentModeEditController.java
src/main/java/org/olat/course/assessment/ui/ChooseElementsController.java 2 additions, 2 deletions

...g/olat/course/assessment/ui/ChooseElementsController.java
src/main/java/org/olat/course/assessment/ui/_content/choose_elements.html 1 addition, 1 deletion

...g/olat/course/assessment/ui/_content/choose_elements.html
src/main/java/org/olat/course/run/CourseRuntimeController.java 22 additions, 18 deletions

...ain/java/org/olat/course/run/CourseRuntimeController.java
src/main/java/org/olat/course/tree/CourseEditorTreeModel.java 2 additions, 3 deletions

...main/java/org/olat/course/tree/CourseEditorTreeModel.java
src/main/java/org/olat/group/area/BGAreaManagerImpl.java 16 additions, 3 deletions

src/main/java/org/olat/group/area/BGAreaManagerImpl.java
src/main/java/org/olat/group/manager/BusinessGroupRelationDAO.java 4 additions, 0 deletions

...java/org/olat/group/manager/BusinessGroupRelationDAO.java
src/main/java/org/olat/group/manager/BusinessGroupServiceImpl.java 4 additions, 0 deletions

...java/org/olat/group/manager/BusinessGroupServiceImpl.java
src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_de.properties 2 additions, 2 deletions

...a/org/olat/group/ui/edit/_i18n/LocalStrings_de.properties
src/main/java/org/olat/portfolio/manager/EPFrontendManager.java 5 additions, 7 deletions

...in/java/org/olat/portfolio/manager/EPFrontendManager.java
src/main/java/org/olat/portfolio/ui/structel/EPMapViewController.java 10 additions, 1 deletion

...a/org/olat/portfolio/ui/structel/EPMapViewController.java
src/main/java/org/olat/portfolio/ui/structel/_content/map_deleted.html 1 addition, 0 deletions

.../org/olat/portfolio/ui/structel/_content/map_deleted.html
src/main/java/org/olat/portfolio/ui/structel/_i18n/LocalStrings_de.properties 2 additions, 0 deletions

...at/portfolio/ui/structel/_i18n/LocalStrings_de.properties
src/main/java/org/olat/portfolio/ui/structel/_i18n/LocalStrings_en.properties 2 additions, 0 deletions

...at/portfolio/ui/structel/_i18n/LocalStrings_en.properties
src/main/java/org/olat/repository/manager/RepositoryServiceImpl.java 6 additions, 1 deletion

...va/org/olat/repository/manager/RepositoryServiceImpl.java

with 147 additions and 50 deletions

Please register or to comment