Merge OpenOLAT default to OpenOLAT 9.0 with 844b35fe4b9e5ffc402a0147a509af88d1fce3e2 (8f50181b) · 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

8f50181b

Commit 8f50181b authored 12 years ago by Florian Gnaegi - frentix GmbH

Downloads
- Plain Diff

Merge OpenOLAT default to OpenOLAT 9.0 with 844b35fe4b9e5ffc402a0147a509af88d1fce3e2

parents 526a5608 dd2c8cba

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/catalog/_spring/catalogContext.xml 2 additions, 0 deletions

src/main/java/org/olat/catalog/_spring/catalogContext.xml
src/main/java/org/olat/core/util/Formatter.java 2 additions, 2 deletions

src/main/java/org/olat/core/util/Formatter.java
src/main/java/org/olat/course/nodes/projectbroker/service/ProjectGroupManagerImpl.java 1 addition, 1 deletion

.../nodes/projectbroker/service/ProjectGroupManagerImpl.java
src/main/java/org/olat/instantMessaging/InstantMessagingModule.java 92 additions, 0 deletions

...ava/org/olat/instantMessaging/InstantMessagingModule.java
src/main/java/org/olat/instantMessaging/ui/ChatController.java 21 additions, 6 deletions

...ain/java/org/olat/instantMessaging/ui/ChatController.java
src/main/java/org/olat/instantMessaging/ui/InstantMessagingAdminController.java 47 additions, 1 deletion

.../instantMessaging/ui/InstantMessagingAdminController.java
src/main/java/org/olat/instantMessaging/ui/RosterForm.java 10 additions, 4 deletions

src/main/java/org/olat/instantMessaging/ui/RosterForm.java
src/main/java/org/olat/instantMessaging/ui/_chelp/instant-messenger-admin.html 2 additions, 2 deletions

...t/instantMessaging/ui/_chelp/instant-messenger-admin.html
src/main/java/org/olat/instantMessaging/ui/_chelp/instant-messenger.html 20 additions, 1 deletion

...rg/olat/instantMessaging/ui/_chelp/instant-messenger.html
src/main/java/org/olat/instantMessaging/ui/_content/roster.html 5 additions, 3 deletions

...in/java/org/olat/instantMessaging/ui/_content/roster.html
src/main/java/org/olat/instantMessaging/ui/_i18n/LocalStrings_de.properties 9 additions, 2 deletions

...olat/instantMessaging/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/instantMessaging/ui/_i18n/LocalStrings_en.properties 8 additions, 1 deletion

...olat/instantMessaging/ui/_i18n/LocalStrings_en.properties

with 219 additions and 23 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