Merge OpenOLAT default branch to OpenOLAT qti with d12a6afd44d75fff6e7a8723f748479e1f1b6c7a (e57edee2) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit e57edee2 authored 9 years ago by srosse

Browse files

Merge OpenOLAT default branch to OpenOLAT qti with d12a6afd44d75fff6e7a8723f748479e1f1b6c7a

parents e44b959b a8e7e9a6

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/sysinfo/UserSessionController.java 2 additions, 1 deletion

...in/java/org/olat/admin/sysinfo/UserSessionController.java
src/main/java/org/olat/admin/sysinfo/manager/SessionStatsManager.java 2 additions, 1 deletion

...a/org/olat/admin/sysinfo/manager/SessionStatsManager.java
src/main/java/org/olat/core/logging/OLogImpl.java 19 additions, 14 deletions

src/main/java/org/olat/core/logging/OLogImpl.java
src/main/java/org/olat/core/logging/Tracing.java 41 additions, 11 deletions

src/main/java/org/olat/core/logging/Tracing.java
src/main/java/org/olat/core/util/session/UserSessionManager.java 127 additions, 151 deletions

...n/java/org/olat/core/util/session/UserSessionManager.java
src/main/java/org/olat/course/assessment/AssessmentHelper.java 5 additions, 2 deletions

...ain/java/org/olat/course/assessment/AssessmentHelper.java
src/main/java/org/olat/course/assessment/AssessmentMainController.java 5 additions, 5 deletions

.../org/olat/course/assessment/AssessmentMainController.java
src/main/java/org/olat/course/nodes/CourseNodeFactory.java 19 additions, 7 deletions

src/main/java/org/olat/course/nodes/CourseNodeFactory.java
src/main/java/org/olat/course/nodes/feed/FeedNodeSecurityCallback.java 4 additions, 1 deletion

.../org/olat/course/nodes/feed/FeedNodeSecurityCallback.java
src/main/java/org/olat/course/nodes/projectbroker/ProjectEditDetailsFormController.java 16 additions, 14 deletions

...nodes/projectbroker/ProjectEditDetailsFormController.java
src/main/java/org/olat/course/nodes/projectbroker/service/ProjectDAO.java 66 additions, 0 deletions

...g/olat/course/nodes/projectbroker/service/ProjectDAO.java
src/main/java/org/olat/course/nodes/projectbroker/service/ProjectGroupManagerImpl.java 3 additions, 1 deletion

.../nodes/projectbroker/service/ProjectGroupManagerImpl.java
src/main/java/org/olat/ims/qti/questionimport/CSVToQuestionConverter.java 15 additions, 4 deletions

...g/olat/ims/qti/questionimport/CSVToQuestionConverter.java
src/main/java/org/olat/modules/dialog/DialogElementsController.java 1 addition, 1 deletion

...ava/org/olat/modules/dialog/DialogElementsController.java
src/main/java/org/olat/modules/webFeed/FeedPreviewSecurityCallback.java 0 additions, 1 deletion

...org/olat/modules/webFeed/FeedPreviewSecurityCallback.java
src/main/java/org/olat/modules/webFeed/FeedResourceSecurityCallback.java 0 additions, 1 deletion

...rg/olat/modules/webFeed/FeedResourceSecurityCallback.java
src/main/java/org/olat/modules/webFeed/RSSFeed.java 2 additions, 0 deletions

src/main/java/org/olat/modules/webFeed/RSSFeed.java
src/main/java/org/olat/modules/webFeed/ui/ItemController.java 12 additions, 6 deletions

...main/java/org/olat/modules/webFeed/ui/ItemController.java
src/main/java/org/olat/modules/webFeed/ui/ItemsController.java 27 additions, 21 deletions

...ain/java/org/olat/modules/webFeed/ui/ItemsController.java
src/main/java/org/olat/modules/webFeed/ui/blog/_content/post.html 6 additions, 8 deletions

.../java/org/olat/modules/webFeed/ui/blog/_content/post.html

with 372 additions and 250 deletions

Please register or to comment