Merge branch 'master' into question-api-rewrite (366a3d73) · Commits · Paul-Christian Volkmer / ARSnova Backend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

366a3d73

Commit 366a3d73 authored 12 years ago by

Daniel Gerhardt

Downloads
- Plain Diff

Merge branch 'master' into question-api-rewrite

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

parents f400f914 4c622221

Branches

Tags

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/thm/arsnova/controller/QuestionByLecturerController.java 2 additions, 2 deletions

.../thm/arsnova/controller/QuestionByLecturerController.java
src/main/java/de/thm/arsnova/dao/CouchDBDao.java 19 additions, 32 deletions

src/main/java/de/thm/arsnova/dao/CouchDBDao.java
src/main/java/de/thm/arsnova/dao/IDatabaseDao.java 3 additions, 5 deletions

src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
src/main/java/de/thm/arsnova/services/QuestionService.java 22 additions, 6 deletions

src/main/java/de/thm/arsnova/services/QuestionService.java
src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java 14 additions, 14 deletions

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

with 60 additions and 59 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