Merge branch 'master' into ldap_integration
Showing
- README.md 30 additions, 26 deletionsREADME.md
- pom.xml 13 additions, 31 deletionspom.xml
- src/main/java/de/thm/arsnova/aop/UserSessionAspect.java 2 additions, 10 deletionssrc/main/java/de/thm/arsnova/aop/UserSessionAspect.java
- src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java 6 additions, 16 deletions...de/thm/arsnova/controller/LecturerQuestionController.java
- src/main/java/de/thm/arsnova/controller/LoginController.java 33 additions, 7 deletionssrc/main/java/de/thm/arsnova/controller/LoginController.java
- src/main/java/de/thm/arsnova/dao/CouchDBDao.java 270 additions, 641 deletionssrc/main/java/de/thm/arsnova/dao/CouchDBDao.java
- src/main/java/de/thm/arsnova/dao/IDatabaseDao.java 2 additions, 9 deletionssrc/main/java/de/thm/arsnova/dao/IDatabaseDao.java
- src/main/java/de/thm/arsnova/dao/NovaView.java 116 additions, 0 deletionssrc/main/java/de/thm/arsnova/dao/NovaView.java
- src/main/java/de/thm/arsnova/entities/Answer.java 10 additions, 1 deletionsrc/main/java/de/thm/arsnova/entities/Answer.java
- src/main/java/de/thm/arsnova/entities/User.java 15 additions, 0 deletionssrc/main/java/de/thm/arsnova/entities/User.java
- src/main/java/de/thm/arsnova/services/IQuestionService.java 2 additions, 0 deletionssrc/main/java/de/thm/arsnova/services/IQuestionService.java
- src/main/java/de/thm/arsnova/services/QuestionService.java 16 additions, 1 deletionsrc/main/java/de/thm/arsnova/services/QuestionService.java
- src/main/java/de/thm/arsnova/services/SessionService.java 12 additions, 2 deletionssrc/main/java/de/thm/arsnova/services/SessionService.java
- src/main/java/de/thm/arsnova/services/UserService.java 5 additions, 1 deletionsrc/main/java/de/thm/arsnova/services/UserService.java
- src/main/java/de/thm/arsnova/services/UserSessionService.java 11 additions, 0 deletions...main/java/de/thm/arsnova/services/UserSessionService.java
- src/main/java/de/thm/arsnova/services/UserSessionServiceImpl.java 31 additions, 0 deletions.../java/de/thm/arsnova/services/UserSessionServiceImpl.java
- src/site/apt/installation.apt 36 additions, 1 deletionsrc/site/apt/installation.apt
- src/site/resources/showcase.png 0 additions, 0 deletionssrc/site/resources/showcase.png
- src/test/java/de/thm/arsnova/controller/LoginControllerTest.java 1 addition, 1 deletion...t/java/de/thm/arsnova/controller/LoginControllerTest.java
- src/test/java/de/thm/arsnova/controller/SessionControllerTest.java 10 additions, 3 deletions...java/de/thm/arsnova/controller/SessionControllerTest.java
Please register or sign in to comment