Merge remote-tracking branch 'origin/OpenOLAT_14.2' (5ae0aad9) · 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

5ae0aad9

Commit 5ae0aad9 authored 5 years ago by srosse

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/OpenOLAT_14.2'

parents 705f259f 47769f4e

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/modules/adobeconnect/manager/AdobeConnect9Provider.java 4 additions, 2 deletions

...t/modules/adobeconnect/manager/AdobeConnect9Provider.java
src/main/java/org/olat/modules/adobeconnect/manager/AdobeConnectUtils.java 4 additions, 0 deletions

.../olat/modules/adobeconnect/manager/AdobeConnectUtils.java
src/main/java/org/olat/modules/adobeconnect/manager/DFNprovider.java 5 additions, 3 deletions

...va/org/olat/modules/adobeconnect/manager/DFNprovider.java
src/main/java/org/olat/modules/qpool/manager/QItemQueriesDAO.java 17 additions, 0 deletions

.../java/org/olat/modules/qpool/manager/QItemQueriesDAO.java
src/main/java/org/olat/modules/qpool/manager/QuestionItemDAO.java 9 additions, 0 deletions

.../java/org/olat/modules/qpool/manager/QuestionItemDAO.java
src/main/java/org/olat/modules/qpool/model/SearchQuestionItemParams.java 12 additions, 0 deletions

...rg/olat/modules/qpool/model/SearchQuestionItemParams.java
src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

...rg/olat/modules/qpool/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

...rg/olat/modules/qpool/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/qpool/ui/metadata/ExtendedSearchController.java 4 additions, 1 deletion

...t/modules/qpool/ui/metadata/ExtendedSearchController.java
src/test/java/org/olat/modules/adobeconnect/manager/AdobeConnectUtilsTest.java 45 additions, 0 deletions

...t/modules/adobeconnect/manager/AdobeConnectUtilsTest.java
src/test/java/org/olat/modules/qpool/manager/QItemQueriesDAOTest.java 35 additions, 0 deletions

...a/org/olat/modules/qpool/manager/QItemQueriesDAOTest.java
src/test/java/org/olat/test/AllTestsJunit4.java 1 addition, 0 deletions

src/test/java/org/olat/test/AllTestsJunit4.java

with 138 additions and 6 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