Merge branch 'Development' into 'testing' (445fa731) · Commits · WIMMA Lab 2019 / Overflow / ehasa-backend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

ehasa-backend
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

445fa731

Commit 445fa731 authored 5 years ago by L4721

Downloads
- Plain Diff

Merge branch 'Development' into 'testing'

Development to testing

See merge request !58

parents 3c9a4092 4e8186cb

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 57
Pipelines 2

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 4 additions, 0 deletions

.gitignore
images/default.jpeg 0 additions, 0 deletions

images/default.jpeg
src/app.controller.ts 6 additions, 1 deletion

src/app.controller.ts
src/app.module.ts 24 additions, 8 deletions

src/app.module.ts
src/draw/coordinate.entity.ts 7 additions, 12 deletions

src/draw/coordinate.entity.ts
src/draw/draw.controller.ts 3 additions, 3 deletions

src/draw/draw.controller.ts
src/draw/draw.module.ts 1 addition, 0 deletions

src/draw/draw.module.ts
src/draw/draw.service.ts 22 additions, 14 deletions

src/draw/draw.service.ts
src/faction/faction.controller.ts 28 additions, 19 deletions

src/faction/faction.controller.ts
src/faction/faction.dto.ts 8 additions, 2 deletions

src/faction/faction.dto.ts
src/faction/faction.entity.ts 4 additions, 9 deletions

src/faction/faction.entity.ts
src/faction/faction.module.ts 13 additions, 4 deletions

src/faction/faction.module.ts
src/faction/faction.service.ts 80 additions, 22 deletions

src/faction/faction.service.ts
src/game/game.controller.ts 50 additions, 2 deletions

src/game/game.controller.ts
src/game/game.dto.ts 12 additions, 8 deletions

src/game/game.dto.ts
src/game/game.entity.ts 13 additions, 7 deletions

src/game/game.entity.ts
src/game/game.module.ts 7 additions, 3 deletions

src/game/game.module.ts
src/game/game.service.ts 72 additions, 21 deletions

src/game/game.service.ts
src/game/gameperson.decorator.ts 11 additions, 8 deletions

src/game/gameperson.decorator.ts
src/main.ts 10 additions, 4 deletions

src/main.ts

with 375 additions and 147 deletions

Loading

0% Loading 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