Merge with 99c7c0f7aff0b648f617b5eaca208a6b0adb970c (c56fd1ad) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit c56fd1ad authored 13 years ago by srosse

Browse files

Merge with 99c7c0f7aff0b648f617b5eaca208a6b0adb970c

parents 0e131943 3b6beec9

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/admin/sysinfo/_content/errors.html 1 addition, 1 deletion

src/main/java/org/olat/admin/sysinfo/_content/errors.html
src/main/java/org/olat/core/gui/exception/_content/exception_page.html 7 additions, 6 deletions

.../org/olat/core/gui/exception/_content/exception_page.html
src/main/java/org/olat/core/logging/LogFileParser.java 16 additions, 4 deletions

src/main/java/org/olat/core/logging/LogFileParser.java
src/main/java/org/olat/modules/fo/_content/threadview.html 1 addition, 1 deletion

src/main/java/org/olat/modules/fo/_content/threadview.html
src/main/java/org/olat/test/guidemo/GuiDemoLinksController.java 7 additions, 2 deletions

...in/java/org/olat/test/guidemo/GuiDemoLinksController.java
src/main/java/org/olat/test/guidemo/_content/guidemo-links.html 5 additions, 2 deletions

...in/java/org/olat/test/guidemo/_content/guidemo-links.html
src/main/java/org/olat/test/guidemo/_i18n/LocalStrings_de.properties 1 addition, 0 deletions

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

...va/org/olat/test/guidemo/_i18n/LocalStrings_en.properties
src/main/java/org/olat/test/guidemo/wizard/GuiDemoStepsRunner.java 2 additions, 3 deletions

...java/org/olat/test/guidemo/wizard/GuiDemoStepsRunner.java
src/main/webapp/static/themes/compiletheme.sh 6 additions, 0 deletions

src/main/webapp/static/themes/compiletheme.sh
src/main/webapp/static/themes/openolat/all/_basemod.scss 25 additions, 12 deletions

src/main/webapp/static/themes/openolat/all/_basemod.scss
src/main/webapp/static/themes/openolat/all/_definitions.scss 7 additions, 2 deletions

src/main/webapp/static/themes/openolat/all/_definitions.scss
src/main/webapp/static/themes/openolat/all/_icons.scss 1 addition, 0 deletions

src/main/webapp/static/themes/openolat/all/_icons.scss
src/main/webapp/static/themes/openolat/all/_mixins.scss 33 additions, 0 deletions

src/main/webapp/static/themes/openolat/all/_mixins.scss
src/main/webapp/static/themes/openolat/all/content.css 38 additions, 8 deletions

src/main/webapp/static/themes/openolat/all/content.css
src/main/webapp/static/themes/openolat/all/content.scss 9 additions, 14 deletions

src/main/webapp/static/themes/openolat/all/content.scss
src/main/webapp/static/themes/openolat/all/modules/_briefcase.scss 2 additions, 2 deletions

...webapp/static/themes/openolat/all/modules/_briefcase.scss
src/main/webapp/static/themes/openolat/all/modules/_dd.scss 1 addition, 1 deletion

src/main/webapp/static/themes/openolat/all/modules/_dd.scss
src/main/webapp/static/themes/openolat/all/modules/_dialogs.scss 3 additions, 2 deletions

...n/webapp/static/themes/openolat/all/modules/_dialogs.scss
src/main/webapp/static/themes/openolat/all/modules/_formsandbuttons.scss 12 additions, 3 deletions

.../static/themes/openolat/all/modules/_formsandbuttons.scss

with 179 additions and 63 deletions

Please register or to comment