Merge branch 'master' into spring4
Showing
- README.md 55 additions, 14 deletionsREADME.md
- pom.xml 4 additions, 3 deletionspom.xml
- src/main/java/de/thm/arsnova/FeedbackStorage.java 1 addition, 4 deletionssrc/main/java/de/thm/arsnova/FeedbackStorage.java
- src/main/java/de/thm/arsnova/ImageUtils.java 134 additions, 0 deletionssrc/main/java/de/thm/arsnova/ImageUtils.java
- src/main/java/de/thm/arsnova/aop/UserSessionAspect.java 5 additions, 25 deletionssrc/main/java/de/thm/arsnova/aop/UserSessionAspect.java
- src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java 1 addition, 0 deletions...de/thm/arsnova/controller/AudienceQuestionController.java
- src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java 87 additions, 12 deletions...de/thm/arsnova/controller/LecturerQuestionController.java
- src/main/java/de/thm/arsnova/controller/LegacyController.java 16 additions, 0 deletions...main/java/de/thm/arsnova/controller/LegacyController.java
- src/main/java/de/thm/arsnova/controller/LoginController.java 13 additions, 11 deletionssrc/main/java/de/thm/arsnova/controller/LoginController.java
- src/main/java/de/thm/arsnova/controller/SessionController.java 32 additions, 15 deletions...ain/java/de/thm/arsnova/controller/SessionController.java
- src/main/java/de/thm/arsnova/dao/CouchDBDao.java 362 additions, 139 deletionssrc/main/java/de/thm/arsnova/dao/CouchDBDao.java
- src/main/java/de/thm/arsnova/dao/IDatabaseDao.java 38 additions, 4 deletionssrc/main/java/de/thm/arsnova/dao/IDatabaseDao.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/entities/Answer.java 20 additions, 2 deletionssrc/main/java/de/thm/arsnova/entities/Answer.java
- src/main/java/de/thm/arsnova/entities/LoggedIn.java 2 additions, 2 deletionssrc/main/java/de/thm/arsnova/entities/LoggedIn.java
- src/main/java/de/thm/arsnova/entities/PossibleAnswer.java 9 additions, 0 deletionssrc/main/java/de/thm/arsnova/entities/PossibleAnswer.java
- src/main/java/de/thm/arsnova/entities/Question.java 55 additions, 0 deletionssrc/main/java/de/thm/arsnova/entities/Question.java
- src/main/java/de/thm/arsnova/entities/Session.java 5 additions, 2 deletionssrc/main/java/de/thm/arsnova/entities/Session.java
- src/main/java/de/thm/arsnova/events/Publisher.java 1 addition, 2 deletionssrc/main/java/de/thm/arsnova/events/Publisher.java
- src/main/java/de/thm/arsnova/services/IQuestionService.java 32 additions, 2 deletionssrc/main/java/de/thm/arsnova/services/IQuestionService.java
Please register or sign in to comment