Merge with 49951336f2e9134cc6921bd70a9ea3fc4de09b89 (4424116d) · 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

4424116d

Commit 4424116d authored 12 years ago by gnaegi

Downloads
- Plain Diff

Merge with 49951336f2e9134cc6921bd70a9ea3fc4de09b89

parents 94ae3523 cf604a90

No related branches found

No related tags found

No related merge requests found

Changes 13

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/group/ui/main/PendingEnrollmentController.java 12 additions, 0 deletions

...a/org/olat/group/ui/main/PendingEnrollmentController.java
src/main/java/org/olat/group/ui/main/_content/accept_reservations.html 28 additions, 15 deletions

.../org/olat/group/ui/main/_content/accept_reservations.html
src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties 11 additions, 6 deletions

...a/org/olat/group/ui/main/_i18n/LocalStrings_de.properties
src/main/webapp/static/themes/openolat/all/_definitions.scss 4 additions, 0 deletions

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

src/main/webapp/static/themes/openolat/all/_icons.scss
src/main/webapp/static/themes/openolat/all/_mixins.scss 1 addition, 1 deletion

src/main/webapp/static/themes/openolat/all/_mixins.scss
src/main/webapp/static/themes/openolat/all/content.css 1 addition, 1 deletion

src/main/webapp/static/themes/openolat/all/content.css
src/main/webapp/static/themes/openolat/all/content.scss 1 addition, 1 deletion

src/main/webapp/static/themes/openolat/all/content.scss
src/main/webapp/static/themes/openolat/all/modules/_formsandbuttons.scss 21 additions, 3 deletions

.../static/themes/openolat/all/modules/_formsandbuttons.scss
src/main/webapp/static/themes/openolat/all/modules/_misc.scss 33 additions, 7 deletions

...main/webapp/static/themes/openolat/all/modules/_misc.scss
src/main/webapp/static/themes/openolat/layout.css 2 additions, 2 deletions

src/main/webapp/static/themes/openolat/layout.css
src/main/webapp/static/themes/openolatexample/all/content.css 1 addition, 1 deletion

...main/webapp/static/themes/openolatexample/all/content.css
src/main/webapp/static/themes/openolatexample/layout.css 2 additions, 2 deletions

src/main/webapp/static/themes/openolatexample/layout.css

with 119 additions and 41 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