Merge OpenOLAT 9.0 to OpenOLAT default branch with dbeeffef64c4bf45f58419cc66e075c6e414bf14 (1cd0975d) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 1cd0975d authored 11 years ago by srosse

Browse files

Merge OpenOLAT 9.0 to OpenOLAT default branch with dbeeffef64c4bf45f58419cc66e075c6e414bf14

parents b7c9c45d 921bb5f6

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/_spring/extensionContext.xml 20 additions, 0 deletions

src/main/java/org/olat/_spring/extensionContext.xml
src/main/java/org/olat/admin/_i18n/LocalStrings_de.properties 2 additions, 0 deletions

...main/java/org/olat/admin/_i18n/LocalStrings_de.properties
src/main/java/org/olat/admin/_i18n/LocalStrings_en.properties 2 additions, 0 deletions

...main/java/org/olat/admin/_i18n/LocalStrings_en.properties
src/main/java/org/olat/admin/bc/BriefcaseAdminController.java 99 additions, 0 deletions

...main/java/org/olat/admin/bc/BriefcaseAdminController.java
src/main/java/org/olat/admin/bc/_content/bc_admin.html 8 additions, 0 deletions

src/main/java/org/olat/admin/bc/_content/bc_admin.html
src/main/java/org/olat/admin/bc/_i18n/LocalStrings_de.properties 4 additions, 0 deletions

...n/java/org/olat/admin/bc/_i18n/LocalStrings_de.properties
src/main/java/org/olat/admin/bc/_i18n/LocalStrings_en.properties 4 additions, 0 deletions

...n/java/org/olat/admin/bc/_i18n/LocalStrings_en.properties
src/main/java/org/olat/admin/sysinfo/ErrorSearchController.java 9 additions, 1 deletion

...in/java/org/olat/admin/sysinfo/ErrorSearchController.java
src/main/java/org/olat/admin/sysinfo/SysinfoController.java 1 addition, 0 deletions

src/main/java/org/olat/admin/sysinfo/SysinfoController.java
src/main/java/org/olat/admin/sysinfo/_content/errors.html 13 additions, 1 deletion

src/main/java/org/olat/admin/sysinfo/_content/errors.html
src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_de.properties 3 additions, 1 deletion

...a/org/olat/admin/sysinfo/_i18n/LocalStrings_de.properties
src/main/java/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties 3 additions, 1 deletion

...a/org/olat/admin/sysinfo/_i18n/LocalStrings_en.properties
src/main/java/org/olat/commons/coordinate/cluster/jms/ClusterEventBus.java 1 addition, 0 deletions

.../olat/commons/coordinate/cluster/jms/ClusterEventBus.java
src/main/java/org/olat/commons/info/restapi/InfoMessagesWebService.java 1 addition, 1 deletion

...org/olat/commons/info/restapi/InfoMessagesWebService.java
src/main/java/org/olat/core/commons/modules/bc/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

.../core/commons/modules/bc/_i18n/LocalStrings_de.properties
src/main/java/org/olat/core/commons/modules/bc/meta/MetaInfoFileImpl.java 11 additions, 0 deletions

...g/olat/core/commons/modules/bc/meta/MetaInfoFileImpl.java
src/main/java/org/olat/core/commons/services/mark/ui/BookmarksController.java 2 additions, 1 deletion

...at/core/commons/services/mark/ui/BookmarksController.java
src/main/java/org/olat/core/gui/components/EscapeMode.java 34 additions, 0 deletions

src/main/java/org/olat/core/gui/components/EscapeMode.java
src/main/java/org/olat/core/gui/components/table/DefaultColumnDescriptor.java 22 additions, 9 deletions

...at/core/gui/components/table/DefaultColumnDescriptor.java
src/main/java/org/olat/core/util/coordinate/LockEntry.java 6 additions, 1 deletion

src/main/java/org/olat/core/util/coordinate/LockEntry.java

with 246 additions and 17 deletions

Please register or to comment