Merge OpenOLAT default branch to OpenOLAT 13a with 9e0bcc84e03249ab25e4a1794952d370a742acbc (cb9e59c2) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit cb9e59c2 authored 6 years ago by srosse

Browse files

Merge OpenOLAT default branch to OpenOLAT 13a with 9e0bcc84e03249ab25e4a1794952d370a742acbc

parents 6eaa795d cf9ff787

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/NewControllerFactory.java 1 addition, 1 deletion

src/main/java/org/olat/NewControllerFactory.java
src/main/java/org/olat/_spring/extensionContext.xml 1 addition, 1 deletion

src/main/java/org/olat/_spring/extensionContext.xml
src/main/java/org/olat/admin/user/_i18n/LocalStrings_en.properties 2 additions, 2 deletions

...java/org/olat/admin/user/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/configuration/AbstractSpringModule.java 4 additions, 0 deletions

...ava/org/olat/core/configuration/AbstractSpringModule.java
src/main/java/org/olat/core/extensions/ExtManager.java 1 addition, 1 deletion

src/main/java/org/olat/core/extensions/ExtManager.java
src/main/java/org/olat/core/util/mail/MailBoxExtension.java 1 addition, 26 deletions

src/main/java/org/olat/core/util/mail/MailBoxExtension.java
src/main/java/org/olat/core/util/mail/manager/MailManagerImpl.java 9 additions, 19 deletions

...java/org/olat/core/util/mail/manager/MailManagerImpl.java
src/main/java/org/olat/core/util/mail/manager/MailUserDataManager.java 184 additions, 0 deletions

.../org/olat/core/util/mail/manager/MailUserDataManager.java
src/main/java/org/olat/course/assessment/ui/tool/ElementToReviewCellRenderer.java 1 addition, 1 deletion

...ourse/assessment/ui/tool/ElementToReviewCellRenderer.java
src/main/java/org/olat/ims/qti/qpool/QTI12ItemFactory.java 6 additions, 2 deletions

src/main/java/org/olat/ims/qti/qpool/QTI12ItemFactory.java
src/main/java/org/olat/ims/qti21/pool/QTI21AssessmentItemFactory.java 5 additions, 0 deletions

...a/org/olat/ims/qti21/pool/QTI21AssessmentItemFactory.java
src/main/java/org/olat/ims/qti21/ui/assessment/CorrectionIdentityAssessmentItemController.java 17 additions, 6 deletions

...ssessment/CorrectionIdentityAssessmentItemController.java
src/main/java/org/olat/ims/qti21/ui/assessment/CorrectionIdentityInteractionsController.java 7 additions, 3 deletions

.../assessment/CorrectionIdentityInteractionsController.java
src/main/java/org/olat/instantMessaging/manager/InstantMessageDAO.java 8 additions, 0 deletions

.../org/olat/instantMessaging/manager/InstantMessageDAO.java
src/main/java/org/olat/instantMessaging/manager/InstantMessagingServiceImpl.java 46 additions, 2 deletions

...instantMessaging/manager/InstantMessagingServiceImpl.java
src/main/java/org/olat/modules/portfolio/manager/PortfolioServiceImpl.java 1 addition, 56 deletions

.../olat/modules/portfolio/manager/PortfolioServiceImpl.java
src/main/java/org/olat/modules/portfolio/manager/PortfolioUserDataManager.java 142 additions, 0 deletions

...t/modules/portfolio/manager/PortfolioUserDataManager.java
src/main/java/org/olat/modules/portfolio/ui/TableOfContentController.java 3 additions, 1 deletion

...g/olat/modules/portfolio/ui/TableOfContentController.java
src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_en.properties 3 additions, 3 deletions

...lat/modules/portfolio/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/portfolio/ui/export/ExportBinderAsCPResource.java 9 additions, 4 deletions

...modules/portfolio/ui/export/ExportBinderAsCPResource.java

with 451 additions and 128 deletions

Please register or to comment