Merge OpenOLAT 9.0 to OpenOLAT default branch with ef08f6dc277eb694176076598c6608127612f0d9 (b929f838) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit b929f838 authored 11 years ago by srosse

Browse files

Merge OpenOLAT 9.0 to OpenOLAT default branch with ef08f6dc277eb694176076598c6608127612f0d9

parents 569262c6 a8c99d5c

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

.hgtags 5 additions, 0 deletions

.hgtags
src/main/java/de/bps/course/condition/interpreter/score/GetOnyxTestOutcomeAnumFunction.java 5 additions, 2 deletions

...ion/interpreter/score/GetOnyxTestOutcomeAnumFunction.java
src/main/java/de/bps/course/condition/interpreter/score/GetOnyxTestOutcomeNumFunction.java 5 additions, 2 deletions

...tion/interpreter/score/GetOnyxTestOutcomeNumFunction.java
src/main/java/org/olat/core/commons/editor/htmleditor/_content/htmleditor.html 4 additions, 3 deletions

...t/core/commons/editor/htmleditor/_content/htmleditor.html
src/main/java/org/olat/course/condition/interpreter/ConditionInterpreter.java 1 addition, 0 deletions

...at/course/condition/interpreter/ConditionInterpreter.java
src/main/java/org/olat/course/condition/interpreter/GetAttemptsFunction.java 5 additions, 2 deletions

...lat/course/condition/interpreter/GetAttemptsFunction.java
src/main/java/org/olat/course/condition/interpreter/GetInitialEnrollmentDateFunction.java 5 additions, 2 deletions

...ndition/interpreter/GetInitialEnrollmentDateFunction.java
src/main/java/org/olat/course/condition/interpreter/GetLastAttemptDateFunction.java 125 additions, 0 deletions

...rse/condition/interpreter/GetLastAttemptDateFunction.java
src/main/java/org/olat/course/condition/interpreter/GetRecentEnrollmentDateFunction.java 5 additions, 2 deletions

...ondition/interpreter/GetRecentEnrollmentDateFunction.java
src/main/java/org/olat/course/condition/interpreter/score/GetPassedFunction.java 8 additions, 2 deletions

...course/condition/interpreter/score/GetPassedFunction.java
src/main/java/org/olat/course/condition/interpreter/score/GetScoreFunction.java 8 additions, 2 deletions

.../course/condition/interpreter/score/GetScoreFunction.java
src/main/java/org/olat/course/editor/_chelp/ced-expert-eg.html 3 additions, 0 deletions

...ain/java/org/olat/course/editor/_chelp/ced-expert-eg.html
src/main/java/org/olat/course/editor/_chelp/ced-expert-expl.html 5 additions, 1 deletion

...n/java/org/olat/course/editor/_chelp/ced-expert-expl.html
src/main/java/org/olat/course/editor/_i18n/LocalStrings_de.properties 3 additions, 0 deletions

...a/org/olat/course/editor/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/editor/_i18n/LocalStrings_en.properties 3 additions, 0 deletions

...a/org/olat/course/editor/_i18n/LocalStrings_en.properties
src/main/java/org/olat/course/run/RunMainController.java 11 additions, 5 deletions

src/main/java/org/olat/course/run/RunMainController.java
src/main/java/org/olat/ims/cp/ui/CPContentController.java 12 additions, 0 deletions

src/main/java/org/olat/ims/cp/ui/CPContentController.java
src/main/java/org/olat/ims/cp/ui/CPEditMainController.java 2 additions, 2 deletions

src/main/java/org/olat/ims/cp/ui/CPEditMainController.java
src/main/java/org/olat/ims/cp/ui/CPTreeController.java 11 additions, 15 deletions

src/main/java/org/olat/ims/cp/ui/CPTreeController.java
src/main/java/org/olat/ims/cp/ui/VFSRootCPContainer.java 17 additions, 3 deletions

src/main/java/org/olat/ims/cp/ui/VFSRootCPContainer.java

with 243 additions and 43 deletions

Please register or to comment