Merge OpenOLAT default branch to OpenOLAT qti with 920531d3b4a448a8739b86f4eb420c165ea78105 (cdfba063) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit cdfba063 authored 9 years ago by srosse

Browse files

Merge OpenOLAT default branch to OpenOLAT qti with 920531d3b4a448a8739b86f4eb420c165ea78105

parents f8cbf41f 445c9a21

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 12 additions, 3 deletions

pom.xml
src/main/java/org/olat/admin/landingpages/model/Rule.java 4 additions, 2 deletions

src/main/java/org/olat/admin/landingpages/model/Rule.java
src/main/java/org/olat/admin/search/_content/index.html 2 additions, 2 deletions

src/main/java/org/olat/admin/search/_content/index.html
src/main/java/org/olat/admin/securitygroup/gui/multi/_content/index.html 2 additions, 2 deletions

...rg/olat/admin/securitygroup/gui/multi/_content/index.html
src/main/java/org/olat/admin/user/SystemRolesAndRightsForm.java 7 additions, 2 deletions

...in/java/org/olat/admin/user/SystemRolesAndRightsForm.java
src/main/java/org/olat/admin/user/UserAdminController.java 48 additions, 29 deletions

src/main/java/org/olat/admin/user/UserAdminController.java
src/main/java/org/olat/admin/user/UserShortDescription.java 1 addition, 0 deletions

src/main/java/org/olat/admin/user/UserShortDescription.java
src/main/java/org/olat/admin/user/_content/userShortDescription.html 6 additions, 2 deletions

...va/org/olat/admin/user/_content/userShortDescription.html
src/main/java/org/olat/commons/calendar/_content/importedCalConfig.html 2 additions, 2 deletions

...org/olat/commons/calendar/_content/importedCalConfig.html
src/main/java/org/olat/commons/calendar/_content/manageCalendars.html 1 addition, 1 deletion

...a/org/olat/commons/calendar/_content/manageCalendars.html
src/main/java/org/olat/commons/calendar/ui/components/FullCalendarComponent.java 5 additions, 4 deletions

...commons/calendar/ui/components/FullCalendarComponent.java
src/main/java/org/olat/core/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

src/main/java/org/olat/core/_i18n/LocalStrings_de.properties
src/main/java/org/olat/core/_spring/mainCorecontext.xml 1 addition, 1 deletion

src/main/java/org/olat/core/_spring/mainCorecontext.xml
src/main/java/org/olat/core/commons/fullWebApp/LayoutMain3ColsController.java 1 addition, 2 deletions

...at/core/commons/fullWebApp/LayoutMain3ColsController.java
src/main/java/org/olat/core/commons/fullWebApp/_content/fullwebapplayout.html 2 additions, 2 deletions

...at/core/commons/fullWebApp/_content/fullwebapplayout.html
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/persistence/_spring/core_persistence.xml 2 additions, 0 deletions

...lat/core/commons/persistence/_spring/core_persistence.xml
src/main/java/org/olat/core/commons/persistence/_spring/databaseCorecontext.xml 0 additions, 2 deletions

.../core/commons/persistence/_spring/databaseCorecontext.xml
src/main/java/org/olat/core/commons/services/commentAndRating/ui/_content/userComments.html 1 addition, 1 deletion

...s/services/commentAndRating/ui/_content/userComments.html
src/main/java/org/olat/core/commons/services/scheduler/_spring/schedulerContext.xml 1 addition, 0 deletions

...e/commons/services/scheduler/_spring/schedulerContext.xml

with 100 additions and 59 deletions

Please register or to comment