Merge OpenOLAT defualt branch to OpenOLAT qti with 6b6d9d94d1380e0f58412b9fb4b5bdc00c6f7a37 (10599ed8) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 10599ed8 authored 8 years ago by srosse

Browse files

Merge OpenOLAT defualt branch to OpenOLAT qti with 6b6d9d94d1380e0f58412b9fb4b5bdc00c6f7a37

parents dfc8155a cb928333

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/commons/coordinate/cluster/lock/ClusterLockManager.java 12 additions, 0 deletions

...t/commons/coordinate/cluster/lock/ClusterLockManager.java
src/main/java/org/olat/commons/coordinate/cluster/lock/ClusterLocker.java 9 additions, 2 deletions

...g/olat/commons/coordinate/cluster/lock/ClusterLocker.java
src/main/java/org/olat/core/commons/editor/htmleditor/HTMLEditorController.java 17 additions, 3 deletions

.../core/commons/editor/htmleditor/HTMLEditorController.java
src/main/java/org/olat/core/commons/editor/htmleditor/WysiwygFactory.java 10 additions, 0 deletions

...g/olat/core/commons/editor/htmleditor/WysiwygFactory.java
src/main/java/org/olat/core/commons/modules/bc/meta/_i18n/LocalStrings_ar.properties 1 addition, 7 deletions

.../commons/modules/bc/meta/_i18n/LocalStrings_ar.properties
src/main/java/org/olat/core/commons/modules/bc/meta/_i18n/LocalStrings_bg.properties 1 addition, 5 deletions

.../commons/modules/bc/meta/_i18n/LocalStrings_bg.properties
src/main/java/org/olat/core/commons/modules/bc/meta/_i18n/LocalStrings_de.properties 2 additions, 1 deletion

.../commons/modules/bc/meta/_i18n/LocalStrings_de.properties
src/main/java/org/olat/core/commons/modules/bc/meta/_i18n/LocalStrings_el.properties 1 addition, 7 deletions

.../commons/modules/bc/meta/_i18n/LocalStrings_el.properties
src/main/java/org/olat/core/commons/modules/bc/meta/_i18n/LocalStrings_en.properties 2 additions, 1 deletion

.../commons/modules/bc/meta/_i18n/LocalStrings_en.properties
src/main/java/org/olat/core/commons/modules/bc/meta/_i18n/LocalStrings_es.properties 1 addition, 5 deletions

.../commons/modules/bc/meta/_i18n/LocalStrings_es.properties
src/main/java/org/olat/core/commons/modules/bc/meta/_i18n/LocalStrings_fr.properties 1 addition, 0 deletions

.../commons/modules/bc/meta/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/core/commons/modules/bc/meta/_i18n/LocalStrings_it.properties 1 addition, 7 deletions

.../commons/modules/bc/meta/_i18n/LocalStrings_it.properties
src/main/java/org/olat/core/commons/modules/bc/meta/_i18n/LocalStrings_jp.properties 1 addition, 7 deletions

.../commons/modules/bc/meta/_i18n/LocalStrings_jp.properties
src/main/java/org/olat/core/commons/modules/bc/meta/_i18n/LocalStrings_nl_NL.properties 1 addition, 7 deletions

...mmons/modules/bc/meta/_i18n/LocalStrings_nl_NL.properties
src/main/java/org/olat/core/commons/modules/bc/meta/_i18n/LocalStrings_pl.properties 1 addition, 7 deletions

.../commons/modules/bc/meta/_i18n/LocalStrings_pl.properties
src/main/java/org/olat/core/commons/modules/bc/meta/_i18n/LocalStrings_pt_BR.properties 1 addition, 0 deletions

...mmons/modules/bc/meta/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/core/commons/modules/bc/meta/_i18n/LocalStrings_ru.properties 1 addition, 0 deletions

.../commons/modules/bc/meta/_i18n/LocalStrings_ru.properties
src/main/java/org/olat/core/commons/modules/bc/meta/_i18n/LocalStrings_zh_CN.properties 1 addition, 6 deletions

...mmons/modules/bc/meta/_i18n/LocalStrings_zh_CN.properties
src/main/java/org/olat/core/commons/modules/bc/meta/_i18n/LocalStrings_zh_TW.properties 1 addition, 7 deletions

...mmons/modules/bc/meta/_i18n/LocalStrings_zh_TW.properties
src/main/java/org/olat/core/gui/components/form/flexible/impl/BasicFormFragment.java 1 addition, 2 deletions

.../gui/components/form/flexible/impl/BasicFormFragment.java

with 66 additions and 74 deletions

Please register or to comment