Merge remote-tracking branch 'remotes/origin/563-spring-security-frontend' into 563-spring-security (554bfd45) · Commits · minerva / core · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

core
- Activity
- Members
- Labels
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

554bfd45

Commit 554bfd45 authored 5 years ago by Sascha Herzinger

Downloads
- Plain Diff

Merge remote-tracking branch 'remotes/origin/563-spring-security-frontend' into 563-spring-security

parents 15bcc1b6 b25bdb73

No related branches found

No related tags found

2 merge requests!836Resolve "Implement Spring Security",!613WIP: New Minerva Security Layer

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

frontend-js/src/main/js/gui/admin/EditUserDialog.js 13 additions, 17 deletions

frontend-js/src/main/js/gui/admin/EditUserDialog.js
frontend-js/src/test/js/ServerConnector-test.js 4 additions, 2 deletions

frontend-js/src/test/js/ServerConnector-test.js
web/src/test/java/lcsb/mapviewer/web/AllIntegrationTests.java 2 additions, 1 deletion

...src/test/java/lcsb/mapviewer/web/AllIntegrationTests.java
web/src/test/java/lcsb/mapviewer/web/ControllerIntegrationTest.java 49 additions, 1 deletion

...st/java/lcsb/mapviewer/web/ControllerIntegrationTest.java
web/src/test/java/lcsb/mapviewer/web/ProjectControllerIntegrationTestForAsyncCalls.java 0 additions, 37 deletions

...er/web/ProjectControllerIntegrationTestForAsyncCalls.java
web/src/test/java/lcsb/mapviewer/web/UserControllerIntegrationTestWithoutTransaction.java 77 additions, 0 deletions

.../web/UserControllerIntegrationTestWithoutTransaction.java

with 145 additions and 58 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