Merge OpenOLAT default branch to OpenOLAT qti with 1c5152e00e619ba0fd9ebd8dde9829c1a04c67e2 (ff09156b) · 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

ff09156b

Commit ff09156b authored 9 years ago by srosse

Downloads
- Plain Diff

Merge OpenOLAT default branch to OpenOLAT qti with 1c5152e00e619ba0fd9ebd8dde9829c1a04c67e2

parents bea7079d 47cd6409

No related branches found

No related tags found

Loading

Changes 12

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/course/nodes/scorm/ScormRunController.java 22 additions, 6 deletions

.../java/org/olat/course/nodes/scorm/ScormRunController.java
src/main/java/org/olat/course/nodes/scorm/_i18n/LocalStrings_de.properties 2 additions, 1 deletion

.../olat/course/nodes/scorm/_i18n/LocalStrings_de.properties
src/main/java/org/olat/course/nodes/scorm/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

.../olat/course/nodes/scorm/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/fo/manager/ForumManager.java 13 additions, 0 deletions

src/main/java/org/olat/modules/fo/manager/ForumManager.java
src/main/java/org/olat/modules/fo/ui/MessageEditController.java 15 additions, 2 deletions

...in/java/org/olat/modules/fo/ui/MessageEditController.java
src/main/java/org/olat/modules/fo/ui/MessageListController.java 33 additions, 11 deletions

...in/java/org/olat/modules/fo/ui/MessageListController.java
src/main/java/org/olat/modules/fo/ui/events/ErrorEditMessage.java 42 additions, 0 deletions

.../java/org/olat/modules/fo/ui/events/ErrorEditMessage.java
src/main/java/org/olat/user/propertyhandlers/SkypePropertyHandler.java 13 additions, 12 deletions

.../org/olat/user/propertyhandlers/SkypePropertyHandler.java
src/main/webapp/static/themes/light/modules/_user.scss 11 additions, 1 deletion

src/main/webapp/static/themes/light/modules/_user.scss
src/main/webapp/static/themes/light/theme.css 1 addition, 1 deletion

src/main/webapp/static/themes/light/theme.css
src/main/webapp/static/themes/light/theme.css.map 1 addition, 1 deletion

src/main/webapp/static/themes/light/theme.css.map
src/main/webapp/static/themes/light/theme_ie_completions.css 1 addition, 1 deletion

src/main/webapp/static/themes/light/theme_ie_completions.css

with 155 additions and 36 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