Merge branch 'master' of github.com:thm-projects/arsnova-backend into public_pool (0251bb47) · Commits · ARSnova / ARSnova Backend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

ARSnova Backend
- Activity
- Members
- Labels
- Releases
- Environments
- Incidents

Snippets Groups Projects

0251bb47

Commit 0251bb47 authored 10 years ago by

Daniel Vogel

Downloads
- Plain Diff

Merge branch 'master' of github.com:thm-projects/arsnova-backend into public_pool

parents d40bd926 3fd3b41f

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

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/dao/CouchDBDao.java 28 additions, 9 deletions

src/main/java/de/thm/arsnova/dao/CouchDBDao.java
src/main/java/de/thm/arsnova/dao/IDatabaseDao.java 2 additions, 0 deletions

src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
src/main/java/de/thm/arsnova/entities/SessionInfo.java 9 additions, 0 deletions

src/main/java/de/thm/arsnova/entities/SessionInfo.java
src/main/java/de/thm/arsnova/services/IQuestionService.java 3 additions, 1 deletion

src/main/java/de/thm/arsnova/services/IQuestionService.java
src/main/java/de/thm/arsnova/services/QuestionService.java 20 additions, 3 deletions

src/main/java/de/thm/arsnova/services/QuestionService.java
src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java 1 addition, 1 deletion

...ain/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java
src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java 6 additions, 0 deletions

src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java

with 80 additions and 14 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment