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

e70184c5

Commit e70184c5 authored 5 years ago by srosse

Downloads
- Plain Diff

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

parents 59fb63cd 72b2dd7d

No related branches found

No related tags found

No related merge requests found

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/gui/control/generic/iframe/IFrameDeliveryMapper.java 1 addition, 1 deletion

...core/gui/control/generic/iframe/IFrameDeliveryMapper.java
src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

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

...olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/qpool/manager/QItemQueriesDAO.java 5 additions, 1 deletion

.../java/org/olat/modules/qpool/manager/QItemQueriesDAO.java
src/main/webapp/static/js/jquery/ui/jquery-ui-1.11.4.custom.tooltip.min.js 0 additions, 6 deletions

...tatic/js/jquery/ui/jquery-ui-1.11.4.custom.tooltip.min.js
src/main/webapp/static/js/openolat/glossaryhighlighter.css 39 additions, 1 deletion

src/main/webapp/static/js/openolat/glossaryhighlighter.css
src/main/webapp/static/js/openolat/glossaryhighlighter.js 3 additions, 9 deletions

src/main/webapp/static/js/openolat/glossaryhighlighter.js

with 50 additions and 20 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