There was an error fetching the commit references. Please try again later.
Merge branch 'SortierbareFragenliste-final' of swtp2015-text-checker-arsnova-backend
Conflicts: pom.xml src/main/java/de/thm/arsnova/dao/CouchDBDao.java src/main/java/de/thm/arsnova/services/IQuestionService.java src/main/java/de/thm/arsnova/services/QuestionService.java
Showing
- src/main/java/de/thm/arsnova/controller/LecturerQuestionController.java 47 additions, 1 deletion...de/thm/arsnova/controller/LecturerQuestionController.java
- src/main/java/de/thm/arsnova/dao/CouchDBDao.java 132 additions, 3 deletionssrc/main/java/de/thm/arsnova/dao/CouchDBDao.java
- src/main/java/de/thm/arsnova/dao/IDatabaseDao.java 11 additions, 2 deletionssrc/main/java/de/thm/arsnova/dao/IDatabaseDao.java
- src/main/java/de/thm/arsnova/entities/Session.java 2 additions, 1 deletionsrc/main/java/de/thm/arsnova/entities/Session.java
- src/main/java/de/thm/arsnova/entities/SortOrder.java 88 additions, 0 deletionssrc/main/java/de/thm/arsnova/entities/SortOrder.java
- src/main/java/de/thm/arsnova/services/IQuestionService.java 9 additions, 2 deletionssrc/main/java/de/thm/arsnova/services/IQuestionService.java
- src/main/java/de/thm/arsnova/services/QuestionService.java 164 additions, 13 deletionssrc/main/java/de/thm/arsnova/services/QuestionService.java
- src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java 28 additions, 3 deletionssrc/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
Please register or sign in to comment