Merge OpenOLAT default branch to OpenOLAT 13a with 1faa2d52ad51a1383629d13f868f5825b941febb (7e2a90a0) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 7e2a90a0 authored 6 years ago by srosse

Browse files

Merge OpenOLAT default branch to OpenOLAT 13a with 1faa2d52ad51a1383629d13f868f5825b941febb

parents 4c902998 cfbad29e

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/core/commons/services/commentAndRating/manager/CommentAndRatingServiceImpl.java 1 addition, 14 deletions

...commentAndRating/manager/CommentAndRatingServiceImpl.java
src/main/java/org/olat/core/commons/services/commentAndRating/manager/CommentAndRatingUserDataManager.java 225 additions, 0 deletions

...entAndRating/manager/CommentAndRatingUserDataManager.java
src/main/java/org/olat/core/commons/services/commentAndRating/manager/UserCommentsDAO.java 12 additions, 5 deletions

...ns/services/commentAndRating/manager/UserCommentsDAO.java
src/main/java/org/olat/core/commons/services/commentAndRating/manager/UserRatingsDAO.java 8 additions, 0 deletions

...ons/services/commentAndRating/manager/UserRatingsDAO.java
src/main/java/org/olat/core/gui/DefaultGlobalSettings.java 19 additions, 0 deletions

src/main/java/org/olat/core/gui/DefaultGlobalSettings.java
src/main/java/org/olat/core/util/FileUtils.java 38 additions, 9 deletions

src/main/java/org/olat/core/util/FileUtils.java
src/main/java/org/olat/course/nodes/gta/GTAManager.java 2 additions, 0 deletions

src/main/java/org/olat/course/nodes/gta/GTAManager.java
src/main/java/org/olat/course/nodes/gta/manager/GTAManagerImpl.java 14 additions, 13 deletions

...ava/org/olat/course/nodes/gta/manager/GTAManagerImpl.java
src/main/java/org/olat/course/nodes/gta/manager/GTAUserDataManager.java 140 additions, 0 deletions

...org/olat/course/nodes/gta/manager/GTAUserDataManager.java
src/main/java/org/olat/course/statistic/export/UserDataLogExporter.java 124 additions, 0 deletions

...org/olat/course/statistic/export/UserDataLogExporter.java
src/main/java/org/olat/modules/portfolio/manager/PortfolioUserDataManager.java 19 additions, 0 deletions

...t/modules/portfolio/manager/PortfolioUserDataManager.java
src/main/java/org/olat/modules/webFeed/manager/FeedManagerImpl.java 0 additions, 3 deletions

...ava/org/olat/modules/webFeed/manager/FeedManagerImpl.java
src/main/java/org/olat/modules/webFeed/manager/FeedUserDataManager.java 135 additions, 0 deletions

...org/olat/modules/webFeed/manager/FeedUserDataManager.java
src/main/java/org/olat/modules/webFeed/manager/ItemDAO.java 8 additions, 0 deletions

src/main/java/org/olat/modules/webFeed/manager/ItemDAO.java
src/main/java/org/olat/modules/webFeed/manager/_content/export_item.html 40 additions, 0 deletions

...rg/olat/modules/webFeed/manager/_content/export_item.html
src/main/java/org/olat/modules/webFeed/model/ItemImpl.java 2 additions, 0 deletions

src/main/java/org/olat/modules/webFeed/model/ItemImpl.java
src/main/java/org/olat/resource/accesscontrol/manager/ACFrontendManager.java 7 additions, 7 deletions

...lat/resource/accesscontrol/manager/ACFrontendManager.java
src/main/java/org/olat/user/ui/data/_i18n/LocalStrings_de.properties 4 additions, 0 deletions

...va/org/olat/user/ui/data/_i18n/LocalStrings_de.properties
src/main/java/org/olat/user/ui/data/_i18n/LocalStrings_en.properties 5 additions, 2 deletions

...va/org/olat/user/ui/data/_i18n/LocalStrings_en.properties

with 803 additions and 53 deletions

Please register or to comment