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

2847005a

Commit 2847005a authored Aug 30, 2019 by Otto Visser

Downloads
- Plain Diff

Merge branch 'import-assistants' into 'development'

Import assistants

Closes #202

See merge request !135

parents 20681f8e 81902f92

No related branches found

No related tags found

2 merge requests!183Use Real IPs instead of Proxy IP for Sentry (#250),!135Import assistants

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

build.gradle 1 addition, 1 deletion

build.gradle
src/main/java/nl/tudelft/ewi/queue/controller/CourseController.java 265 additions, 235 deletions

...ava/nl/tudelft/ewi/queue/controller/CourseController.java
src/main/java/nl/tudelft/ewi/queue/helper/CsvUserHelper.java 67 additions, 0 deletions

src/main/java/nl/tudelft/ewi/queue/helper/CsvUserHelper.java
src/main/java/nl/tudelft/ewi/queue/model/DefaultRole.java 29 additions, 11 deletions

src/main/java/nl/tudelft/ewi/queue/model/DefaultRole.java
src/main/java/nl/tudelft/ewi/queue/model/User.java 4 additions, 0 deletions

src/main/java/nl/tudelft/ewi/queue/model/User.java
src/main/java/nl/tudelft/ewi/queue/service/CourseService.java 90 additions, 10 deletions

...main/java/nl/tudelft/ewi/queue/service/CourseService.java
src/main/java/nl/tudelft/ewi/queue/service/SAMLUserDetailsServiceImpl.java 8 additions, 0 deletions

...tudelft/ewi/queue/service/SAMLUserDetailsServiceImpl.java
src/main/resources/templates/course/create/participant.html 33 additions, 0 deletions

src/main/resources/templates/course/create/participant.html

with 497 additions and 257 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