Merge with 294c245ad416bd13cfc3ca1f8673bcb700ea2342 (484d0372) · 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

484d0372

Commit 484d0372 authored 7 years ago by gnaegi

Downloads
- Plain Diff

Merge with 294c245ad416bd13cfc3ca1f8673bcb700ea2342

parents d5d3af7b c04b7701

No related branches found

No related tags found

No related merge requests found

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/modules/portfolio/ui/MediaDetailsController.java 6 additions, 0 deletions

...org/olat/modules/portfolio/ui/MediaDetailsController.java
src/main/java/org/olat/modules/portfolio/ui/_content/media_details.html 4 additions, 0 deletions

...org/olat/modules/portfolio/ui/_content/media_details.html
src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_de.properties 1 addition, 1 deletion

...lat/modules/portfolio/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_en.properties 1 addition, 1 deletion

...lat/modules/portfolio/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/portfolio/ui/media/StandardEditMediaController.java 0 additions, 7 deletions

...dules/portfolio/ui/media/StandardEditMediaController.java
src/main/java/org/olat/modules/portfolio/ui/wizard/CollectArtefactController.java 0 additions, 4 deletions

...odules/portfolio/ui/wizard/CollectArtefactController.java
src/main/webapp/static/bootstrap/stylesheets/bootstrap/_forms.scss 0 additions, 1 deletion

...webapp/static/bootstrap/stylesheets/bootstrap/_forms.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/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

with 16 additions and 18 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