Merge branch '2.x' (b3037f10) · 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

b3037f10

Commit b3037f10 authored 7 years ago by

Daniel Gerhardt

Downloads
- Plain Diff

Merge branch '2.x'

parents aeeff5e1 328933d5

Branches

Tags

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 8 additions, 5 deletions

pom.xml
src/main/java/de/thm/arsnova/config/SecurityConfig.java 39 additions, 103 deletions

src/main/java/de/thm/arsnova/config/SecurityConfig.java
src/main/java/de/thm/arsnova/controller/LoginController.java 18 additions, 16 deletions

src/main/java/de/thm/arsnova/controller/LoginController.java
src/main/java/de/thm/arsnova/entities/User.java 5 additions, 5 deletions

src/main/java/de/thm/arsnova/entities/User.java
src/main/java/de/thm/arsnova/security/ApplicationPermissionEvaluator.java 12 additions, 12 deletions

.../thm/arsnova/security/ApplicationPermissionEvaluator.java
src/main/java/de/thm/arsnova/services/UserService.java 12 additions, 12 deletions

src/main/java/de/thm/arsnova/services/UserService.java
src/test/java/de/thm/arsnova/config/TestSecurityConfig.java 6 additions, 44 deletions

src/test/java/de/thm/arsnova/config/TestSecurityConfig.java
src/test/java/de/thm/arsnova/services/UserServiceTest.java 11 additions, 6 deletions

src/test/java/de/thm/arsnova/services/UserServiceTest.java

with 111 additions and 203 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