Merge branch 'master' of scm.thm.de:arsnova/arsnova-war (026b0c52) · Commits · ARSnova / ARSnova Backend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

026b0c52

There was an error fetching the commit references. Please try again later.

Commit 026b0c52 authored 12 years ago by

Paul-Christian Volkmer

Downloads
- Plain Diff

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

parents 083d352c 804a6da8

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/thm/arsnova/SessionController.java 3 additions, 0 deletions

src/main/java/de/thm/arsnova/SessionController.java
src/main/java/de/thm/arsnova/services/SessionService.java 6 additions, 3 deletions

src/main/java/de/thm/arsnova/services/SessionService.java
src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java 1 addition, 57 deletions

...ain/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
src/main/webapp/WEB-INF/api-servlet.xml 0 additions, 47 deletions

src/main/webapp/WEB-INF/api-servlet.xml
src/main/webapp/WEB-INF/arsnova-servlet.xml 3 additions, 22 deletions

src/main/webapp/WEB-INF/arsnova-servlet.xml
src/main/webapp/WEB-INF/spring/spring-main.xml 44 additions, 7 deletions

src/main/webapp/WEB-INF/spring/spring-main.xml
src/main/webapp/WEB-INF/spring/spring-security.xml 0 additions, 4 deletions

src/main/webapp/WEB-INF/spring/spring-security.xml
src/main/webapp/WEB-INF/web.xml 0 additions, 9 deletions

src/main/webapp/WEB-INF/web.xml
src/test/resources/arsnova.properties.example 19 additions, 0 deletions

src/test/resources/arsnova.properties.example

with 76 additions and 149 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