Merge OpenOLAT 10.4 to OpenOLAT default branch with cf474859804a3846ab3d1172cb5e65705a839c59 (b7a4533a) · 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

b7a4533a

Commit b7a4533a authored 9 years ago by srosse

Downloads
- Plain Diff

Merge OpenOLAT 10.4 to OpenOLAT default branch with cf474859804a3846ab3d1172cb5e65705a839c59

parents 15f4f75a 4083a95a

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/core/commons/modules/glossary/_spring/glossaryCorecontext.xml 4 additions, 2 deletions

.../commons/modules/glossary/_spring/glossaryCorecontext.xml
src/main/webapp/static/js/tinymce4/BTinyHelper.js 23 additions, 19 deletions

src/main/webapp/static/js/tinymce4/BTinyHelper.js
src/main/webapp/static/js/tinymce4/tinymce/plugins/olatmovieviewer/plugin.js 12 additions, 12 deletions

...tic/js/tinymce4/tinymce/plugins/olatmovieviewer/plugin.js
src/main/webapp/static/js/tinymce4/tinymce/plugins/olatmovieviewer/plugin.min.js 1 addition, 1 deletion

...js/tinymce4/tinymce/plugins/olatmovieviewer/plugin.min.js
src/main/webapp/static/js/tinymce4/tinymce/plugins/olatsmileys/plugin.js 55 additions, 44 deletions

.../static/js/tinymce4/tinymce/plugins/olatsmileys/plugin.js
src/main/webapp/static/js/tinymce4/tinymce/plugins/olatsmileys/plugin.min.js 1 addition, 1 deletion

...tic/js/tinymce4/tinymce/plugins/olatsmileys/plugin.min.js

with 96 additions and 79 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