Merge commit 'refs/merge-requests/7' of git://scm.thm.de/arsnova/arsnova-war into merge-requests/7
Showing
- src/main/java/de/thm/arsnova/aop/AuthorizationAdviser.java 1 addition, 2 deletionssrc/main/java/de/thm/arsnova/aop/AuthorizationAdviser.java
- src/main/java/de/thm/arsnova/controller/FeedbackController.java 1 addition, 2 deletions...in/java/de/thm/arsnova/controller/FeedbackController.java
- src/main/java/de/thm/arsnova/controller/LoginController.java 1 addition, 1 deletionsrc/main/java/de/thm/arsnova/controller/LoginController.java
- src/main/java/de/thm/arsnova/controller/SessionController.java 8 additions, 9 deletions...ain/java/de/thm/arsnova/controller/SessionController.java
- src/main/java/de/thm/arsnova/dao/CouchDBDao.java 5 additions, 4 deletionssrc/main/java/de/thm/arsnova/dao/CouchDBDao.java
- src/main/java/de/thm/arsnova/services/ISessionService.java 1 addition, 4 deletionssrc/main/java/de/thm/arsnova/services/ISessionService.java
- src/main/java/de/thm/arsnova/services/IUserService.java 16 additions, 2 deletionssrc/main/java/de/thm/arsnova/services/IUserService.java
- src/main/java/de/thm/arsnova/services/SessionService.java 6 additions, 34 deletionssrc/main/java/de/thm/arsnova/services/SessionService.java
- src/main/java/de/thm/arsnova/services/UserService.java 81 additions, 8 deletionssrc/main/java/de/thm/arsnova/services/UserService.java
- src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java 11 additions, 14 deletions...ain/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
- src/test/java/de/thm/arsnova/controller/SessionControllerTest.java 13 additions, 0 deletions...java/de/thm/arsnova/controller/SessionControllerTest.java
- src/test/java/de/thm/arsnova/services/StubUserService.java 58 additions, 3 deletionssrc/test/java/de/thm/arsnova/services/StubUserService.java
Please register or sign in to comment