Merge OpenOLAT 10.4 to OpenOLAT default branch with 4961147a9accf81be2579759f4db47e32b4195ec (fa02263b) · 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

fa02263b

Commit fa02263b authored 9 years ago by srosse

Downloads
- Plain Diff

Merge OpenOLAT 10.4 to OpenOLAT default branch with 4961147a9accf81be2579759f4db47e32b4195ec

parents 7461494e a1e7e749

No related branches found

No related tags found

No related merge requests found

Changes 14

Expand all Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 11 additions, 0 deletions

pom.xml
src/main/java/org/olat/commons/calendar/ICalServlet.java 100 additions, 7 deletions

src/main/java/org/olat/commons/calendar/ICalServlet.java
src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

...rg/olat/commons/calendar/_i18n/LocalStrings_de.properties
src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_en.properties 1 addition, 0 deletions

...rg/olat/commons/calendar/_i18n/LocalStrings_en.properties
src/main/java/org/olat/commons/calendar/ui/CalendarColorChooserController.java 3 additions, 2 deletions

...t/commons/calendar/ui/CalendarColorChooserController.java
src/main/java/org/olat/commons/calendar/ui/CalendarPrintMapper.java 21 additions, 9 deletions

...ava/org/olat/commons/calendar/ui/CalendarPrintMapper.java
src/main/java/org/olat/commons/calendar/ui/_content/calColor.html 9 additions, 4 deletions

.../java/org/olat/commons/calendar/ui/_content/calColor.html
src/main/webapp/static/themes/light/modules/_cal.scss 127 additions, 0 deletions

src/main/webapp/static/themes/light/modules/_cal.scss
src/main/webapp/static/themes/light/theme.css 1 addition, 1 deletion

src/main/webapp/static/themes/light/theme.css
src/main/webapp/static/themes/light/theme.css.map 1 addition, 1 deletion

src/main/webapp/static/themes/light/theme.css.map
src/main/webapp/static/themes/light/theme_ie_completions.css 1 addition, 1 deletion

src/main/webapp/static/themes/light/theme_ie_completions.css
src/main/webapp/static/themes/openolat/theme.css 1 addition, 1 deletion

src/main/webapp/static/themes/openolat/theme.css
src/main/webapp/static/themes/openolat/theme.css.map 1 addition, 1 deletion

src/main/webapp/static/themes/openolat/theme.css.map
src/main/webapp/static/themes/openolat/theme_ie_completions.css 1 addition, 1 deletion

...in/webapp/static/themes/openolat/theme_ie_completions.css

with 279 additions and 28 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