Merge branch 'msp-team6-pq' (bc12d54b) · 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

bc12d54b

Commit bc12d54b authored 10 years ago by

Christoph Thelen

Downloads
- Plain Diff

Merge branch 'msp-team6-pq'

parents 80b154b3 b4958864

Branches

Tags

No related merge requests found

Changes 7

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 4 additions, 4 deletions

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

src/main/webapp/arsnova.properties.example
src/test/resources/arsnova.properties.example 4 additions, 1 deletion

src/test/resources/arsnova.properties.example

with 233 additions and 6 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