Merge branch 'master' into privatemaster
Showing
- src/main/java/de/thm/arsnova/FeedbackStorage.java 0 additions, 128 deletionssrc/main/java/de/thm/arsnova/FeedbackStorage.java
- src/main/java/de/thm/arsnova/aop/UserSessionAspect.java 14 additions, 30 deletionssrc/main/java/de/thm/arsnova/aop/UserSessionAspect.java
- src/main/java/de/thm/arsnova/events/ARSnovaEventListener.java 2 additions, 8 deletions...main/java/de/thm/arsnova/events/ARSnovaEventListener.java
- src/main/java/de/thm/arsnova/services/FeedbackService.java 92 additions, 17 deletionssrc/main/java/de/thm/arsnova/services/FeedbackService.java
- src/main/java/de/thm/arsnova/services/IUserService.java 0 additions, 5 deletionssrc/main/java/de/thm/arsnova/services/IUserService.java
- src/main/java/de/thm/arsnova/services/SessionService.java 3 additions, 7 deletionssrc/main/java/de/thm/arsnova/services/SessionService.java
- src/main/java/de/thm/arsnova/services/UserService.java 92 additions, 21 deletionssrc/main/java/de/thm/arsnova/services/UserService.java
- src/main/java/de/thm/arsnova/services/UserSessionService.java 0 additions, 5 deletions...main/java/de/thm/arsnova/services/UserSessionService.java
- src/main/java/de/thm/arsnova/services/UserSessionServiceImpl.java 1 addition, 41 deletions.../java/de/thm/arsnova/services/UserSessionServiceImpl.java
- src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java 27 additions, 26 deletions...ain/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
- src/test/java/de/thm/arsnova/controller/FeedbackControllerTest.java 1 addition, 5 deletions...ava/de/thm/arsnova/controller/FeedbackControllerTest.java
- src/test/java/de/thm/arsnova/controller/StatisticsControllerTest.java 2 additions, 2 deletions...a/de/thm/arsnova/controller/StatisticsControllerTest.java
- src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java 0 additions, 9 deletionssrc/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
- src/test/java/de/thm/arsnova/services/FeedbackServiceTest.java 0 additions, 61 deletions...est/java/de/thm/arsnova/services/FeedbackServiceTest.java
- src/test/java/de/thm/arsnova/services/StatisticsServiceTest.java 1 addition, 1 deletion...t/java/de/thm/arsnova/services/StatisticsServiceTest.java
Please register or sign in to comment