Merge with 35d69481c0aa4635b1c094e92405bbad978bb043 (75b6eac7) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 75b6eac7 authored 13 years ago by rhaag

Merge with 35d69481c0aa4635b1c094e92405bbad978bb043

merge actual uzhfixes to default branch

parents 0a5f2d26 e435150c

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

olat3/webapp/WEB-INF/src/org/olat/course/CourseFactory.java 0 additions, 3 deletions

olat3/webapp/WEB-INF/src/org/olat/course/CourseFactory.java
olat3/webapp/WEB-INF/src/org/olat/course/assessment/EfficiencyStatementController.java 55 additions, 1 deletion

...olat/course/assessment/EfficiencyStatementController.java
olat3/webapp/WEB-INF/src/org/olat/course/assessment/_content/efficiencystatement.html 12 additions, 0 deletions

.../olat/course/assessment/_content/efficiencystatement.html
olat3/webapp/WEB-INF/src/org/olat/course/nodes/ProjectBrokerCourseNode.java 36 additions, 8 deletions

...NF/src/org/olat/course/nodes/ProjectBrokerCourseNode.java
olat3/webapp/WEB-INF/src/org/olat/course/nodes/TACourseNode.java 17 additions, 5 deletions

...ebapp/WEB-INF/src/org/olat/course/nodes/TACourseNode.java
olat3/webapp/WEB-INF/src/org/olat/course/nodes/projectbroker/CancelNewProjectEvent.java 0 additions, 48 deletions

...lat/course/nodes/projectbroker/CancelNewProjectEvent.java
olat3/webapp/WEB-INF/src/org/olat/course/nodes/projectbroker/ProjectBrokerEditorEvent.java 68 additions, 0 deletions

.../course/nodes/projectbroker/ProjectBrokerEditorEvent.java
olat3/webapp/WEB-INF/src/org/olat/course/nodes/projectbroker/ProjectDetailsDisplayController.java 1 addition, 1 deletion

.../nodes/projectbroker/ProjectDetailsDisplayController.java
olat3/webapp/WEB-INF/src/org/olat/course/nodes/projectbroker/ProjectDetailsPanelController.java 15 additions, 13 deletions

...se/nodes/projectbroker/ProjectDetailsPanelController.java
olat3/webapp/WEB-INF/src/org/olat/course/nodes/projectbroker/ProjectListController.java 12 additions, 7 deletions

...lat/course/nodes/projectbroker/ProjectListController.java
olat3/webapp/WEB-INF/src/org/olat/course/nodes/ta/DropboxController.java 2 additions, 3 deletions

...B-INF/src/org/olat/course/nodes/ta/DropboxController.java
olat3/webapp/WEB-INF/src/org/olat/course/repository/ImportCourseController.java 1 addition, 1 deletion

...rc/org/olat/course/repository/ImportCourseController.java
olat3/webapp/WEB-INF/src/org/olat/ims/cp/ui/CPFileImportController.java 16 additions, 6 deletions

...EB-INF/src/org/olat/ims/cp/ui/CPFileImportController.java
olat3/webapp/WEB-INF/src/org/olat/ims/cp/ui/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

...F/src/org/olat/ims/cp/ui/_i18n/LocalStrings_en.properties
olat3/webapp/WEB-INF/src/org/olat/modules/wiki/WikiMainController.java 18 additions, 5 deletions

...WEB-INF/src/org/olat/modules/wiki/WikiMainController.java
olat3/webapp/WEB-INF/src/org/olat/portfolio/manager/EPFrontendManager.java 37 additions, 9 deletions

...INF/src/org/olat/portfolio/manager/EPFrontendManager.java
olat3/webapp/WEB-INF/src/org/olat/portfolio/manager/EPStructureManager.java 66 additions, 34 deletions

...NF/src/org/olat/portfolio/manager/EPStructureManager.java
olat3/webapp/WEB-INF/src/org/olat/portfolio/ui/structel/EPMultipleMapController.java 90 additions, 12 deletions

...g/olat/portfolio/ui/structel/EPMultipleMapController.java
olat3/webapp/WEB-INF/src/org/olat/portfolio/ui/structel/_content/multiMaps.html 22 additions, 0 deletions

...rc/org/olat/portfolio/ui/structel/_content/multiMaps.html
olat3/webapp/static/js/ext/OLAT_EXTJS.README 35 additions, 2 deletions

olat3/webapp/static/js/ext/OLAT_EXTJS.README

with 504 additions and 158 deletions

Please register or to comment