Merge OpenOLAT 8.2 to OpenOLAT default branch with 197cffefd2d2b5c64ec5895fce1221120f2d1ec9 (c440b430) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit c440b430 authored 12 years ago by srosse

Browse files

Merge OpenOLAT 8.2 to OpenOLAT default branch with 197cffefd2d2b5c64ec5895fce1221120f2d1ec9

parents 51b31c4d 152c98e2

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 15 additions, 11 deletions

src/main/java/org/olat/basesecurity/BaseSecurityManager.java
src/main/java/org/olat/core/commons/persistence/_spring/databaseCorecontext.xml 1 addition, 1 deletion

.../core/commons/persistence/_spring/databaseCorecontext.xml
src/main/java/org/olat/core/gui/components/progressbar/ProgressController.java 75 additions, 0 deletions

...t/core/gui/components/progressbar/ProgressController.java
src/main/java/org/olat/core/gui/components/progressbar/_content/progress.html 4 additions, 0 deletions

...at/core/gui/components/progressbar/_content/progress.html
src/main/java/org/olat/core/gui/control/generic/iframe/IFrameDeliveryMapper.java 1 addition, 1 deletion

...core/gui/control/generic/iframe/IFrameDeliveryMapper.java
src/main/java/org/olat/core/util/async/ProgressDelegate.java 34 additions, 0 deletions

src/main/java/org/olat/core/util/async/ProgressDelegate.java
src/main/java/org/olat/course/assessment/AssessmentMainController.java 2 additions, 2 deletions

.../org/olat/course/assessment/AssessmentMainController.java
src/main/java/org/olat/course/assessment/manager/UserCourseInformationsManagerImpl.java 25 additions, 13 deletions

...assessment/manager/UserCourseInformationsManagerImpl.java
src/main/java/org/olat/course/member/MembersOverviewController.java 41 additions, 3 deletions

...ava/org/olat/course/member/MembersOverviewController.java
src/main/java/org/olat/course/member/_content/members_overview.html 3 additions, 0 deletions

...ava/org/olat/course/member/_content/members_overview.html
src/main/java/org/olat/course/member/_i18n/LocalStrings_de.properties 3 additions, 0 deletions

...a/org/olat/course/member/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/member/_i18n/LocalStrings_en.properties 7 additions, 4 deletions

...a/org/olat/course/member/_i18n/LocalStrings_en.properties
src/main/java/org/olat/group/BusinessGroupService.java 24 additions, 0 deletions

src/main/java/org/olat/group/BusinessGroupService.java
src/main/java/org/olat/group/manager/BusinessGroupServiceImpl.java 101 additions, 0 deletions

...java/org/olat/group/manager/BusinessGroupServiceImpl.java
src/main/java/org/olat/group/ui/BusinessGroupModuleAdminController.java 105 additions, 7 deletions

...org/olat/group/ui/BusinessGroupModuleAdminController.java
src/main/java/org/olat/group/ui/_content/bg_admin.html 13 additions, 0 deletions

src/main/java/org/olat/group/ui/_content/bg_admin.html
src/main/java/org/olat/group/ui/_i18n/LocalStrings_de.properties 4 additions, 0 deletions

...n/java/org/olat/group/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/group/ui/_i18n/LocalStrings_en.properties 6 additions, 2 deletions

...n/java/org/olat/group/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/group/ui/main/DedupMembersConfirmationController.java 102 additions, 0 deletions

...lat/group/ui/main/DedupMembersConfirmationController.java
src/main/java/org/olat/group/ui/main/_content/dedup.html 6 additions, 0 deletions

src/main/java/org/olat/group/ui/main/_content/dedup.html

with 572 additions and 44 deletions

Please register or to comment