Merge remote-tracking branch 'origin/OpenOLAT_12.5' into OpenOLAT_13.2 (64347071) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

OLAT CI-CD Testing Project
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

64347071

Commit 64347071 authored 6 years ago by uhensler

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_12.5' into OpenOLAT_13.2

parents faa46179 d9b0a830

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/bps/olat/modules/cl/ChecklistMultiSelectColumnDescriptor.java 19 additions, 0 deletions

...olat/modules/cl/ChecklistMultiSelectColumnDescriptor.java
src/main/java/org/olat/core/gui/components/table/ColumnDescriptor.java 3 additions, 0 deletions

.../org/olat/core/gui/components/table/ColumnDescriptor.java
src/main/java/org/olat/core/gui/components/table/DefaultColumnDescriptor.java 27 additions, 50 deletions

...at/core/gui/components/table/DefaultColumnDescriptor.java
src/main/java/org/olat/core/gui/components/table/MultiSelectColumnDescriptor.java 16 additions, 0 deletions

...ore/gui/components/table/MultiSelectColumnDescriptor.java
src/main/java/org/olat/core/gui/components/table/StaticColumnDescriptor.java 24 additions, 44 deletions

...lat/core/gui/components/table/StaticColumnDescriptor.java
src/main/java/org/olat/core/gui/components/table/TableRenderer.java 3 additions, 1 deletion

...ava/org/olat/core/gui/components/table/TableRenderer.java
src/main/java/org/olat/course/statistic/StatisticDisplayController.java 9 additions, 7 deletions

...org/olat/course/statistic/StatisticDisplayController.java
src/main/java/org/olat/course/statistic/TotalAwareColumnDescriptor.java 2 additions, 3 deletions

...org/olat/course/statistic/TotalAwareColumnDescriptor.java
src/main/java/org/olat/course/statistic/daily/DailyStatisticManager.java 1 addition, 1 deletion

...rg/olat/course/statistic/daily/DailyStatisticManager.java

with 104 additions and 106 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment