Merge branch 'ldap_integration' of scm.thm.de:arsnova/arsnova-war into ldap_integration (594d8618) · 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

594d8618

Commit 594d8618 authored 11 years ago by

Paul-Christian Volkmer

Downloads
- Plain Diff

Merge branch 'ldap_integration' of scm.thm.de:arsnova/arsnova-war into ldap_integration

parents c35af17d 8fdc901a

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 16 additions, 2 deletions

pom.xml
src/main/java/de/thm/arsnova/controller/LoginController.java 10 additions, 3 deletions

src/main/java/de/thm/arsnova/controller/LoginController.java
src/main/resources/test.ldif 26 additions, 0 deletions

src/main/resources/test.ldif
src/main/webapp/WEB-INF/spring/spring-main.xml 2 additions, 1 deletion

src/main/webapp/WEB-INF/spring/spring-main.xml
src/main/webapp/WEB-INF/spring/spring-security.xml 2 additions, 1 deletion

src/main/webapp/WEB-INF/spring/spring-security.xml
src/main/webapp/arsnova.properties.example 1 addition, 1 deletion

src/main/webapp/arsnova.properties.example
src/main/webapp/login.html 29 additions, 7 deletions

src/main/webapp/login.html
src/main/webapp/uni_logo_mlu.jpg 0 additions, 0 deletions

src/main/webapp/uni_logo_mlu.jpg
src/test/resources/test.ldif 22 additions, 0 deletions

src/test/resources/test.ldif

with 108 additions and 15 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