Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Queue
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Terraform modules
- Incidents

Snippets Groups Projects

e37bb875

Commit e37bb875 authored Sep 8, 2018 by Administrator

Downloads
- Plain Diff

Merge branch 'development' into 'feedbacklabs'

Development

See merge request EIP/queue!89

parents 3dca10d3 2b0c1cac

Branches

Tags

No related merge requests found

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

build.gradle 1 addition, 1 deletion

build.gradle
src/main/java/nl/tudelft/ewi/queue/DatabaseLoader.java 42 additions, 3 deletions

src/main/java/nl/tudelft/ewi/queue/DatabaseLoader.java
src/main/java/nl/tudelft/ewi/queue/model/Lab.java 37 additions, 23 deletions

src/main/java/nl/tudelft/ewi/queue/model/Lab.java
src/main/java/nl/tudelft/ewi/queue/service/SAMLUserDetailsServiceImpl.java 1 addition, 1 deletion

...tudelft/ewi/queue/service/SAMLUserDetailsServiceImpl.java
src/main/resources/templates/request/list/filters.html 4 additions, 3 deletions

src/main/resources/templates/request/list/filters.html
src/main/resources/templates/request/list/requesttable.html 2 additions, 0 deletions

src/main/resources/templates/request/list/requesttable.html

with 87 additions and 31 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please sign in to comment