Merge branch 'gridimage-content-format' into 'master' (bc5c682b) · 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

bc5c682b

Commit bc5c682b authored 5 years ago by

Daniel Gerhardt

Downloads
- Plain Diff

Merge branch 'gridimage-content-format' into 'master'

Gridimage content format

See merge request arsnova/arsnova-backend!180

parents 7f7af445 c3391ee9

Branches

Pipeline #31968 failed with stages

in 0 seconds

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/thm/arsnova/controller/v2/ContentController.java 7 additions, 6 deletions

.../java/de/thm/arsnova/controller/v2/ContentController.java
src/main/java/de/thm/arsnova/model/GridImageContent.java 206 additions, 0 deletions

src/main/java/de/thm/arsnova/model/GridImageContent.java
src/main/java/de/thm/arsnova/model/migration/FromV2Migrator.java 128 additions, 43 deletions

...n/java/de/thm/arsnova/model/migration/FromV2Migrator.java
src/main/java/de/thm/arsnova/model/migration/ToV2Migrator.java 105 additions, 18 deletions

...ain/java/de/thm/arsnova/model/migration/ToV2Migrator.java
src/main/java/de/thm/arsnova/model/serialization/FormatAnswerTypeIdResolver.java 2 additions, 0 deletions

...snova/model/serialization/FormatAnswerTypeIdResolver.java
src/main/java/de/thm/arsnova/model/serialization/FormatContentTypeIdResolver.java 3 additions, 0 deletions

...nova/model/serialization/FormatContentTypeIdResolver.java
src/main/java/de/thm/arsnova/service/AnswerServiceImpl.java 15 additions, 3 deletions

src/main/java/de/thm/arsnova/service/AnswerServiceImpl.java

with 466 additions and 70 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