Merge branch 'interposed-cleanup' (103315b6) · 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

103315b6

Commit 103315b6 authored 10 years ago by

Christoph Thelen

Downloads
- Plain Diff

Merge branch 'interposed-cleanup'

parents 24d752a7 c3dfda62

Branches

Tags

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/thm/arsnova/controller/AudienceQuestionController.java 4 additions, 9 deletions

...de/thm/arsnova/controller/AudienceQuestionController.java
src/main/java/de/thm/arsnova/dao/CouchDBDao.java 3 additions, 3 deletions

src/main/java/de/thm/arsnova/dao/CouchDBDao.java
src/main/java/de/thm/arsnova/entities/InterposedQuestion.java 4 additions, 0 deletions

...main/java/de/thm/arsnova/entities/InterposedQuestion.java
src/main/java/de/thm/arsnova/entities/transport/InterposedQuestion.java 71 additions, 0 deletions

...de/thm/arsnova/entities/transport/InterposedQuestion.java
src/main/java/de/thm/arsnova/events/DeleteInterposedQuestionEvent.java 26 additions, 0 deletions

.../de/thm/arsnova/events/DeleteInterposedQuestionEvent.java
src/main/java/de/thm/arsnova/services/IQuestionService.java 2 additions, 0 deletions

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

src/main/java/de/thm/arsnova/services/QuestionService.java
src/main/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java 20 additions, 0 deletions

...ain/java/de/thm/arsnova/socket/ARSnovaSocketIOServer.java

with 148 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