Merge branch 'master' into question-based-progress
Showing
- src/main/java/de/thm/arsnova/controller/ConfigurationController.java 38 additions, 0 deletions...va/de/thm/arsnova/controller/ConfigurationController.java
- src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java 11 additions, 0 deletions...de/thm/arsnova/controller/LecturerQuestionController.java
- src/main/java/de/thm/arsnova/controller/SessionController.java 31 additions, 1 deletion...ain/java/de/thm/arsnova/controller/SessionController.java
- src/main/java/de/thm/arsnova/dao/CouchDBDao.java 91 additions, 10 deletionssrc/main/java/de/thm/arsnova/dao/CouchDBDao.java
- src/main/java/de/thm/arsnova/dao/IDatabaseDao.java 10 additions, 0 deletionssrc/main/java/de/thm/arsnova/dao/IDatabaseDao.java
- src/main/java/de/thm/arsnova/entities/Session.java 100 additions, 0 deletionssrc/main/java/de/thm/arsnova/entities/Session.java
- src/main/java/de/thm/arsnova/entities/SessionInfo.java 19 additions, 0 deletionssrc/main/java/de/thm/arsnova/entities/SessionInfo.java
- src/main/java/de/thm/arsnova/services/IQuestionService.java 3 additions, 1 deletionsrc/main/java/de/thm/arsnova/services/IQuestionService.java
- src/main/java/de/thm/arsnova/services/ISessionService.java 6 additions, 0 deletionssrc/main/java/de/thm/arsnova/services/ISessionService.java
- src/main/java/de/thm/arsnova/services/QuestionService.java 29 additions, 5 deletionssrc/main/java/de/thm/arsnova/services/QuestionService.java
- src/main/java/de/thm/arsnova/services/SessionService.java 41 additions, 0 deletionssrc/main/java/de/thm/arsnova/services/SessionService.java
- src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java 1 addition, 1 deletion...ain/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
- src/main/resources/arsnova.properties.example 32 additions, 1 deletionsrc/main/resources/arsnova.properties.example
- src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java 24 additions, 0 deletionssrc/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
- src/test/resources/arsnova.properties.example 32 additions, 1 deletionsrc/test/resources/arsnova.properties.example
Please register or sign in to comment