There was an error fetching the commit references. Please try again later.
Merge branch 'master' into ldap_integration
Conflicts: pom.xml
Showing
- README.md 55 additions, 14 deletionsREADME.md
- pom.xml 5 additions, 4 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/aop/UserSessionAspect.java 0 additions, 2 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/SessionController.java 9 additions, 0 deletions...ain/java/de/thm/arsnova/controller/SessionController.java
- src/main/java/de/thm/arsnova/dao/CouchDBDao.java 307 additions, 115 deletionssrc/main/java/de/thm/arsnova/dao/CouchDBDao.java
- src/main/java/de/thm/arsnova/dao/IDatabaseDao.java 36 additions, 4 deletionssrc/main/java/de/thm/arsnova/dao/IDatabaseDao.java
- src/main/java/de/thm/arsnova/entities/Answer.java 11 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/Question.java 9 additions, 0 deletionssrc/main/java/de/thm/arsnova/entities/Question.java
- src/main/java/de/thm/arsnova/entities/Session.java 4 additions, 0 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
- src/main/java/de/thm/arsnova/services/ISessionService.java 2 additions, 2 deletionssrc/main/java/de/thm/arsnova/services/ISessionService.java
- src/main/java/de/thm/arsnova/services/QuestionService.java 159 additions, 37 deletionssrc/main/java/de/thm/arsnova/services/QuestionService.java
- src/main/java/de/thm/arsnova/services/SessionService.java 18 additions, 10 deletionssrc/main/java/de/thm/arsnova/services/SessionService.java
- src/main/java/de/thm/arsnova/services/UserSessionService.java 1 addition, 1 deletion...main/java/de/thm/arsnova/services/UserSessionService.java
Please register or sign in to comment