Merge branch 'TypeORM' into 'Development' (87f13e68) · 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

87f13e68

Commit 87f13e68 authored 5 years ago by L4721

Downloads
- Plain Diff

Merge branch 'TypeORM' into 'Development'

Type orm

See merge request !14

parents 39308d36 8d6e7d46

No related branches found

No related tags found

2 merge requests!59Development to master,!14Type orm

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/game/coordinate.entity.ts 56 additions, 0 deletions

src/game/coordinate.entity.ts
src/game/faction.entity.ts 86 additions, 0 deletions

src/game/faction.entity.ts
src/game/game.controller.ts 8 additions, 2 deletions

src/game/game.controller.ts
src/game/game.dto.ts 92 additions, 45 deletions

src/game/game.dto.ts
src/game/game.entity.ts 175 additions, 17 deletions

src/game/game.entity.ts
src/game/game.module.ts 1 addition, 1 deletion

src/game/game.module.ts
src/game/game.service.ts 30 additions, 16 deletions

src/game/game.service.ts
src/mapmarkers/mapmarkers.controller.ts 1 addition, 1 deletion

src/mapmarkers/mapmarkers.controller.ts
src/user/user.entity.ts 14 additions, 4 deletions

src/user/user.entity.ts
src/user/user.module.ts 1 addition, 1 deletion

src/user/user.module.ts

with 464 additions and 87 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