Merge branch 'master' into ldap_integration
Showing
- pom.xml 18 additions, 8 deletionspom.xml
- src/main/java/de/thm/arsnova/FeedbackStorage.java 134 additions, 0 deletionssrc/main/java/de/thm/arsnova/FeedbackStorage.java
- src/main/java/de/thm/arsnova/annotation/package-info.java 0 additions, 1 deletionsrc/main/java/de/thm/arsnova/annotation/package-info.java
- src/main/java/de/thm/arsnova/aop/UserSessionAspect.java 58 additions, 0 deletionssrc/main/java/de/thm/arsnova/aop/UserSessionAspect.java
- src/main/java/de/thm/arsnova/aop/package-info.java 0 additions, 1 deletionsrc/main/java/de/thm/arsnova/aop/package-info.java
- src/main/java/de/thm/arsnova/controller/AbstractController.java 2 additions, 2 deletions...in/java/de/thm/arsnova/controller/AbstractController.java
- src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java 1 addition, 1 deletion...de/thm/arsnova/controller/AudienceQuestionController.java
- src/main/java/de/thm/arsnova/controller/CourseController.java 5 additions, 9 deletions...main/java/de/thm/arsnova/controller/CourseController.java
- src/main/java/de/thm/arsnova/controller/LoginController.java 27 additions, 1 deletionsrc/main/java/de/thm/arsnova/controller/LoginController.java
- src/main/java/de/thm/arsnova/controller/SessionController.java 2 additions, 1 deletion...ain/java/de/thm/arsnova/controller/SessionController.java
- src/main/java/de/thm/arsnova/controller/SocketController.java 5 additions, 5 deletions...main/java/de/thm/arsnova/controller/SocketController.java
- src/main/java/de/thm/arsnova/controller/StatisticsController.java 8 additions, 0 deletions.../java/de/thm/arsnova/controller/StatisticsController.java
- src/main/java/de/thm/arsnova/dao/CouchDBDao.java 11 additions, 11 deletionssrc/main/java/de/thm/arsnova/dao/CouchDBDao.java
- src/main/java/de/thm/arsnova/dao/IDatabaseDao.java 0 additions, 1 deletionsrc/main/java/de/thm/arsnova/dao/IDatabaseDao.java
- src/main/java/de/thm/arsnova/entities/Answer.java 1 addition, 2 deletionssrc/main/java/de/thm/arsnova/entities/Answer.java
- src/main/java/de/thm/arsnova/entities/FoodVote.java 1 addition, 2 deletionssrc/main/java/de/thm/arsnova/entities/FoodVote.java
- src/main/java/de/thm/arsnova/entities/InterposedQuestion.java 0 additions, 1 deletion...main/java/de/thm/arsnova/entities/InterposedQuestion.java
- src/main/java/de/thm/arsnova/entities/LoggedIn.java 13 additions, 0 deletionssrc/main/java/de/thm/arsnova/entities/LoggedIn.java
- src/main/java/de/thm/arsnova/entities/Session.java 21 additions, 2 deletionssrc/main/java/de/thm/arsnova/entities/Session.java
- src/main/java/de/thm/arsnova/entities/package-info.java 1 addition, 1 deletionsrc/main/java/de/thm/arsnova/entities/package-info.java
Please register or sign in to comment