Merge branch 'master' of scm.thm.de:arsnova/msp1314-planquadrat-arsnova-war into msp-team6-pq (b5d82e67) · 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

b5d82e67

Commit b5d82e67 authored 10 years ago by

Christoph Thelen

Downloads
- Plain Diff

Merge branch 'master' of scm.thm.de:arsnova/msp1314-planquadrat-arsnova-war into msp-team6-pq

parents cf9f8464 725bb5b1

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/thm/arsnova/ImageUtils.java 134 additions, 0 deletions

src/main/java/de/thm/arsnova/ImageUtils.java
src/main/java/de/thm/arsnova/dao/CouchDBDao.java 13 additions, 1 deletion

src/main/java/de/thm/arsnova/dao/CouchDBDao.java
src/main/java/de/thm/arsnova/entities/Question.java 46 additions, 0 deletions

src/main/java/de/thm/arsnova/entities/Question.java
src/main/java/de/thm/arsnova/services/QuestionService.java 29 additions, 0 deletions

src/main/java/de/thm/arsnova/services/QuestionService.java
src/main/webapp/WEB-INF/spring/spring-main.xml 1 addition, 1 deletion

src/main/webapp/WEB-INF/spring/spring-main.xml
src/main/webapp/arsnova.properties 34 additions, 0 deletions

src/main/webapp/arsnova.properties

with 257 additions and 2 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