Merge branch 'master' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git (e18fd362) · 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

e18fd362

Commit e18fd362 authored 6 years ago by srosse

Downloads
- Plain Diff

Merge branch 'master' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git

parents e45c83de 9e56d325

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/core/_spring/mainCorecontext.xml 1 addition, 2 deletions

src/main/java/org/olat/core/_spring/mainCorecontext.xml
src/main/java/org/olat/core/commons/modules/glossary/GlossaryFlexionController.java 0 additions, 247 deletions

...e/commons/modules/glossary/GlossaryFlexionController.java
src/main/java/org/olat/core/commons/modules/glossary/GlossaryItemEditorController.java 2 additions, 27 deletions

...ommons/modules/glossary/GlossaryItemEditorController.java
src/main/java/org/olat/core/commons/modules/glossary/GlossaryModule.java 0 additions, 53 deletions

...rg/olat/core/commons/modules/glossary/GlossaryModule.java
src/main/java/org/olat/core/commons/modules/glossary/_spring/glossaryCorecontext.xml 0 additions, 45 deletions

.../commons/modules/glossary/_spring/glossaryCorecontext.xml
src/main/java/org/olat/core/commons/modules/glossary/morphService/FlexionReply.java 0 additions, 91 deletions

...e/commons/modules/glossary/morphService/FlexionReply.java
src/main/java/org/olat/core/commons/modules/glossary/morphService/MorphologicalService.java 0 additions, 90 deletions

...s/modules/glossary/morphService/MorphologicalService.java
src/main/java/org/olat/core/commons/modules/glossary/morphService/MorphologicalServiceDEImpl.java 0 additions, 206 deletions

...les/glossary/morphService/MorphologicalServiceDEImpl.java
src/main/java/org/olat/core/commons/modules/glossary/morphService/MorphologicalServiceFRImpl.java 0 additions, 173 deletions

...les/glossary/morphService/MorphologicalServiceFRImpl.java
src/main/java/org/olat/core/commons/modules/glossary/morphService/MorphologicalServiceLocalImpl.java 0 additions, 104 deletions

.../glossary/morphService/MorphologicalServiceLocalImpl.java

with 3 additions and 1038 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