Merge branch 'master' into customization
Showing
- src/main/java/de/thm/arsnova/aop/UserSessionAspect.java 5 additions, 23 deletionssrc/main/java/de/thm/arsnova/aop/UserSessionAspect.java
- src/main/java/de/thm/arsnova/controller/SessionController.java 16 additions, 17 deletions...ain/java/de/thm/arsnova/controller/SessionController.java
- src/main/java/de/thm/arsnova/dao/CouchDBDao.java 30 additions, 30 deletionssrc/main/java/de/thm/arsnova/dao/CouchDBDao.java
- src/main/java/de/thm/arsnova/dao/NovaView.java 1 addition, 1 deletionsrc/main/java/de/thm/arsnova/dao/NovaView.java
- src/main/java/de/thm/arsnova/services/SessionService.java 4 additions, 4 deletionssrc/main/java/de/thm/arsnova/services/SessionService.java
- src/main/java/de/thm/arsnova/services/UserService.java 16 additions, 11 deletionssrc/main/java/de/thm/arsnova/services/UserService.java
- src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java 9 additions, 9 deletions...ain/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
- src/test/java/de/thm/arsnova/ARSnovaChromeDriver.java 0 additions, 35 deletionssrc/test/java/de/thm/arsnova/ARSnovaChromeDriver.java
- src/test/java/de/thm/arsnova/HttpRestApiTest.java 0 additions, 172 deletionssrc/test/java/de/thm/arsnova/HttpRestApiTest.java
- src/test/java/de/thm/arsnova/Selenium2Test.java 0 additions, 150 deletionssrc/test/java/de/thm/arsnova/Selenium2Test.java
- src/test/java/de/thm/arsnova/controller/FeedbackControllerTest.java 29 additions, 66 deletions...ava/de/thm/arsnova/controller/FeedbackControllerTest.java
- src/test/java/de/thm/arsnova/controller/LecturerQuestionControllerTest.java 0 additions, 91 deletions...hm/arsnova/controller/LecturerQuestionControllerTest.java
- src/test/java/de/thm/arsnova/controller/StatisticsControllerTest.java 28 additions, 37 deletions...a/de/thm/arsnova/controller/StatisticsControllerTest.java
- src/test/resources/test-socketioconfig.xml 13 additions, 0 deletionssrc/test/resources/test-socketioconfig.xml
Please register or sign in to comment