Merge remote-tracking branch 'origin/OpenOLAT_13.1' (cccc969d) · 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

cccc969d

Commit cccc969d authored 6 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_13.1'

parents 0867c99e 6e8f9c5c

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/ims/qti21/manager/archive/interactions/MatchInteractionArchive.java 101 additions, 77 deletions

...manager/archive/interactions/MatchInteractionArchive.java
src/main/java/org/olat/ims/qti21/ui/assessment/CorrectionAssessmentItemListController.java 16 additions, 12 deletions

...ui/assessment/CorrectionAssessmentItemListController.java
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

...olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

...olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties
src/main/java/org/olat/ims/qti21/ui/editor/overview/ControlObjectRow.java 81 additions, 18 deletions

...g/olat/ims/qti21/ui/editor/overview/ControlObjectRow.java
src/main/java/org/olat/ims/qti21/ui/editor/overview/MaxAttemptsCellRenderer.java 3 additions, 2 deletions

...ims/qti21/ui/editor/overview/MaxAttemptsCellRenderer.java
src/main/java/org/olat/ims/qti21/ui/editor/overview/OptionAndInheritance.java 57 additions, 0 deletions

...at/ims/qti21/ui/editor/overview/OptionAndInheritance.java
src/main/java/org/olat/ims/qti21/ui/editor/overview/OptionCellRenderer.java 9 additions, 4 deletions

...olat/ims/qti21/ui/editor/overview/OptionCellRenderer.java
src/main/java/org/olat/search/service/indexer/repository/CourseIndexer.java 4 additions, 1 deletion

...olat/search/service/indexer/repository/CourseIndexer.java
src/main/java/org/olat/search/service/indexer/repository/RepositoryIndexer.java 1 addition, 1 deletion

.../search/service/indexer/repository/RepositoryIndexer.java

with 274 additions and 115 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