Merge private repository in upstream master (b3ce3309) · 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

b3ce3309

Commit b3ce3309 authored 12 years ago by

Paul-Christian Volkmer

Downloads
- Plain Diff

Merge private repository in upstream master

parents 77fc8107 8229832d

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

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

...in/java/de/thm/arsnova/controller/QuestionController.java
src/main/java/de/thm/arsnova/controller/SessionController.java 2 additions, 3 deletions

...ain/java/de/thm/arsnova/controller/SessionController.java
src/main/java/de/thm/arsnova/dao/CouchDBDao.java 2 additions, 8 deletions

src/main/java/de/thm/arsnova/dao/CouchDBDao.java
src/main/java/de/thm/arsnova/dao/IDatabaseDao.java 1 addition, 1 deletion

src/main/java/de/thm/arsnova/dao/IDatabaseDao.java
src/main/java/de/thm/arsnova/entities/User.java 15 additions, 2 deletions

src/main/java/de/thm/arsnova/entities/User.java
src/main/java/de/thm/arsnova/services/IQuestionService.java 1 addition, 1 deletion

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

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

src/main/java/de/thm/arsnova/services/SessionService.java
src/main/java/de/thm/arsnova/services/UserService.java 66 additions, 3 deletions

src/main/java/de/thm/arsnova/services/UserService.java
src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java 1 addition, 1 deletion

src/test/java/de/thm/arsnova/dao/StubDatabaseDao.java
src/test/java/de/thm/arsnova/services/StubUserService.java 1 addition, 54 deletions

src/test/java/de/thm/arsnova/services/StubUserService.java

with 94 additions and 78 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