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

Commit d4538044 authored 12 years ago by srosse

Browse files

Merge OpenOLAT default branch to OpenOLAT 9.0 with b4c7866a0e984e0dd90a218f05f5e9f57077ee60

parents db0bc903 b3ffa17f

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/basesecurity/BaseSecurityManager.java 12 additions, 2 deletions

src/main/java/org/olat/basesecurity/BaseSecurityManager.java
src/main/java/org/olat/catalog/ui/CatalogController.java 1 addition, 0 deletions

src/main/java/org/olat/catalog/ui/CatalogController.java
src/main/java/org/olat/commons/calendar/restapi/CalendarWebService.java 2 additions, 1 deletion

...org/olat/commons/calendar/restapi/CalendarWebService.java
src/main/java/org/olat/commons/coordinate/cluster/jms/ClusterEventBus.java 9 additions, 3 deletions

.../olat/commons/coordinate/cluster/jms/ClusterEventBus.java
src/main/java/org/olat/core/commons/persistence/DB.java 0 additions, 4 deletions

src/main/java/org/olat/core/commons/persistence/DB.java
src/main/java/org/olat/core/commons/persistence/DBImpl.java 227 additions, 273 deletions

src/main/java/org/olat/core/commons/persistence/DBImpl.java
src/main/java/org/olat/core/commons/persistence/DBManager.java 81 additions, 163 deletions

...ain/java/org/olat/core/commons/persistence/DBManager.java
src/main/java/org/olat/core/commons/persistence/DBSession.java 0 additions, 140 deletions

...ain/java/org/olat/core/commons/persistence/DBSession.java
src/main/java/org/olat/core/commons/persistence/DBTransaction.java 0 additions, 145 deletions

...java/org/olat/core/commons/persistence/DBTransaction.java
src/main/java/org/olat/core/commons/persistence/_spring/databaseCorecontext.xml 4 additions, 0 deletions

.../core/commons/persistence/_spring/databaseCorecontext.xml
src/main/java/org/olat/core/commons/services/commentAndRating/impl/ui/UserCommentsAndRatingsController.java 4 additions, 4 deletions

...ntAndRating/impl/ui/UserCommentsAndRatingsController.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/MultiSelectionTree.java 14 additions, 12 deletions

...nents/form/flexible/impl/elements/MultiSelectionTree.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/SelectionTreeComponent.java 10 additions, 2 deletions

...s/form/flexible/impl/elements/SelectionTreeComponent.java
src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/SelectionTreeComponentRenderer.java 12 additions, 4 deletions

...lexible/impl/elements/SelectionTreeComponentRenderer.java
src/main/java/org/olat/core/util/event/MultiUserEvent.java 8 additions, 5 deletions

src/main/java/org/olat/core/util/event/MultiUserEvent.java
src/main/java/org/olat/core/util/i18n/I18nModule.java 1 addition, 1 deletion

src/main/java/org/olat/core/util/i18n/I18nModule.java
src/main/java/org/olat/core/util/mail/manager/MailManager.java 6 additions, 1 deletion

...ain/java/org/olat/core/util/mail/manager/MailManager.java
src/main/java/org/olat/core/util/tree/INodeFilter.java 5 additions, 1 deletion

src/main/java/org/olat/core/util/tree/INodeFilter.java
src/main/java/org/olat/course/condition/ConditionConfigEasyController.java 2 additions, 16 deletions

.../olat/course/condition/ConditionConfigEasyController.java
src/main/java/org/olat/course/editor/PublishProcess.java 2 additions, 2 deletions

src/main/java/org/olat/course/editor/PublishProcess.java

with 400 additions and 779 deletions

Please register or to comment