Merge branch 'auth-services-per-role' into 'master' (80ffc9b2) · Commits · Paul-Christian Volkmer / ARSnova Backend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

ARSnova Backend
- Activity
- Members
- Labels
- Releases
- Environments

Snippets Groups Projects

80ffc9b2

Commit 80ffc9b2 authored 9 years ago by

Daniel Gerhardt

Downloads
- Plain Diff

Merge branch 'auth-services-per-role' into 'master'

Extend API and config to support auth services per role



See merge request !22

parents 93c7f91d 1a3e9582

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/thm/arsnova/controller/LoginController.java 22 additions, 9 deletions

src/main/java/de/thm/arsnova/controller/LoginController.java
src/main/java/de/thm/arsnova/entities/ServiceDescription.java 12 additions, 11 deletions

...main/java/de/thm/arsnova/entities/ServiceDescription.java
src/main/resources/arsnova.properties.example 8 additions, 1 deletion

src/main/resources/arsnova.properties.example

with 42 additions and 21 deletions

0% 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