Merge OpenOLAT 11.2 to OpenOLAT default branch with c16df475d0d398029013d14e225246c6a30244bd (70bf4767) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 70bf4767 authored 8 years ago by srosse

Browse files

Merge OpenOLAT 11.2 to OpenOLAT default branch with c16df475d0d398029013d14e225246c6a30244bd

parents 8602d910 6b2cda58

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/UserSearchFlexiController.java 3 additions, 2 deletions

...n/java/org/olat/admin/user/UserSearchFlexiController.java
src/main/java/org/olat/basesecurity/BaseSecurity.java 7 additions, 1 deletion

src/main/java/org/olat/basesecurity/BaseSecurity.java
src/main/java/org/olat/basesecurity/BaseSecurityManager.java 5 additions, 3 deletions

src/main/java/org/olat/basesecurity/BaseSecurityManager.java
src/main/java/org/olat/core/gui/components/form/flexible/elements/FlexiTableSortOptions.java 7 additions, 0 deletions

...ponents/form/flexible/elements/FlexiTableSortOptions.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/SortableFlexiTableModelDelegate.java 4 additions, 0 deletions

.../impl/elements/table/SortableFlexiTableModelDelegate.java
src/main/java/org/olat/course/CourseFactory.java 9 additions, 4 deletions

src/main/java/org/olat/course/CourseFactory.java
src/main/java/org/olat/course/archiver/ScoreAccountingArchiveController.java 10 additions, 10 deletions

...lat/course/archiver/ScoreAccountingArchiveController.java
src/main/java/org/olat/course/archiver/ScoreAccountingHelper.java 112 additions, 339 deletions

.../java/org/olat/course/archiver/ScoreAccountingHelper.java
src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeController.java 9 additions, 1 deletion

.../assessment/ui/tool/IdentityListCourseNodeController.java
src/main/java/org/olat/course/member/wizard/ImportMemberBySearchController.java 3 additions, 13 deletions

.../course/member/wizard/ImportMemberBySearchController.java
src/main/java/org/olat/course/member/wizard/ImportMemberOverviewIdentitiesController.java 62 additions, 26 deletions

...mber/wizard/ImportMemberOverviewIdentitiesController.java
src/main/java/org/olat/course/nodes/TACourseNode.java 4 additions, 4 deletions

src/main/java/org/olat/course/nodes/TACourseNode.java
src/main/java/org/olat/course/nodes/cl/ui/CheckListAssessmentController.java 3 additions, 2 deletions

...lat/course/nodes/cl/ui/CheckListAssessmentController.java
src/main/java/org/olat/course/nodes/cl/ui/CheckListAssessmentDataModel.java 6 additions, 5 deletions

...olat/course/nodes/cl/ui/CheckListAssessmentDataModel.java
src/main/java/org/olat/course/nodes/cl/ui/CheckListAssessmentDataModelSorter.java 92 additions, 0 deletions

...ourse/nodes/cl/ui/CheckListAssessmentDataModelSorter.java
src/main/java/org/olat/course/nodes/cl/ui/CheckboxAssessmentController.java 7 additions, 5 deletions

...olat/course/nodes/cl/ui/CheckboxAssessmentController.java
src/main/java/org/olat/course/nodes/cl/ui/CheckboxAssessmentDataModel.java 7 additions, 5 deletions

.../olat/course/nodes/cl/ui/CheckboxAssessmentDataModel.java
src/main/java/org/olat/course/nodes/cl/ui/CheckboxAssessmentDataModelSorter.java 88 additions, 0 deletions

...course/nodes/cl/ui/CheckboxAssessmentDataModelSorter.java
src/main/java/org/olat/repository/RepositoryManager.java 9 additions, 1 deletion

src/main/java/org/olat/repository/RepositoryManager.java
src/main/java/org/olat/repository/manager/RepositoryEntryRelationDAO.java 9 additions, 0 deletions

...g/olat/repository/manager/RepositoryEntryRelationDAO.java

with 456 additions and 421 deletions

Please register or to comment