Merge OpenOLAT 11.2 to OpenOLAT default branch with d3767ebc7d13d4fa1fcb629dc383f91e224320c7 (24154bfa) · 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

24154bfa

Commit 24154bfa authored 8 years ago by srosse

Downloads
- Plain Diff

Merge OpenOLAT 11.2 to OpenOLAT default branch with d3767ebc7d13d4fa1fcb629dc383f91e224320c7

parents 3de5ae39 49052ebd

No related branches found

No related tags found

No related merge requests found

Changes 12

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/commons/calendar/ui/components/FullCalendarComponentRenderer.java 7 additions, 7 deletions

...calendar/ui/components/FullCalendarComponentRenderer.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/FormJSHelper.java 50 additions, 9 deletions

.../core/gui/components/form/flexible/impl/FormJSHelper.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/richText/RichTextElementRenderer.java 1 addition, 1 deletion

...xible/impl/elements/richText/RichTextElementRenderer.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/AbstractFlexiTableRenderer.java 15 additions, 12 deletions

...xible/impl/elements/table/AbstractFlexiTableRenderer.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableClassicRenderer.java 5 additions, 4 deletions

...exible/impl/elements/table/FlexiTableClassicRenderer.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java 1 addition, 1 deletion

...m/flexible/impl/elements/table/FlexiTableElementImpl.java
src/main/java/org/olat/course/nodes/cl/ui/CheckListAssessmentController.java 2 additions, 2 deletions

...lat/course/nodes/cl/ui/CheckListAssessmentController.java
src/main/java/org/olat/resource/accesscontrol/provider/paypal/PaypalModule.java 1 addition, 1 deletion

.../resource/accesscontrol/provider/paypal/PaypalModule.java
src/main/webapp/static/js/functions.js 15 additions, 3 deletions

src/main/webapp/static/js/functions.js
src/main/webapp/static/js/js.plugins.min.js 1 addition, 1 deletion

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

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

.../static/js/tinymce4/tinymce/plugins/olatqti/plugin.min.js

with 100 additions and 43 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