Merge branch 'testing' of... (9e8bf1b9) · 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

9e8bf1b9

Commit 9e8bf1b9 authored 5 years ago by L4168

Downloads
- Plain Diff

Merge branch 'testing' of...

Merge branch 'testing' of gitlab.labranet.jamk.fi:wimma-lab-2019/overflow/ehasa-backend into testing

parents e5dfcce5 11420cc1

No related branches found

No related tags found

No related merge requests found

Changes 67

Hide whitespace changes

Inline Side-by-side

Showing

docker-compose.yml 1 addition, 1 deletion

docker-compose.yml
ormconfig.json.example 11 additions, 11 deletions

ormconfig.json.example
package-lock.json 16 additions, 147 deletions

package-lock.json
package.json 1 addition, 2 deletions

package.json
src/app.module.ts 21 additions, 4 deletions

src/app.module.ts
src/draw/coordinate.entity.ts 51 additions, 0 deletions

src/draw/coordinate.entity.ts
src/draw/draw.controller.ts 42 additions, 0 deletions

src/draw/draw.controller.ts
src/draw/draw.module.ts 24 additions, 0 deletions

src/draw/draw.module.ts
src/draw/draw.service.ts 46 additions, 0 deletions

src/draw/draw.service.ts
src/draw/mapdrawing.dto.ts 27 additions, 0 deletions

src/draw/mapdrawing.dto.ts
src/faction/faction.controller.ts 98 additions, 0 deletions

src/faction/faction.controller.ts
src/faction/faction.dto.ts 64 additions, 0 deletions

src/faction/faction.dto.ts
src/faction/faction.entity.ts 48 additions, 31 deletions

src/faction/faction.entity.ts
src/faction/faction.module.ts 20 additions, 0 deletions

src/faction/faction.module.ts
src/faction/faction.service.ts 149 additions, 0 deletions

src/faction/faction.service.ts
src/game/game.controller.spec.ts 0 additions, 18 deletions

src/game/game.controller.spec.ts
src/game/game.controller.ts 28 additions, 38 deletions

src/game/game.controller.ts
src/game/game.dto.ts 68 additions, 31 deletions

src/game/game.dto.ts
src/game/game.entity.ts 40 additions, 24 deletions

src/game/game.entity.ts
src/game/game.json-nested.dto.ts 16 additions, 0 deletions

src/game/game.json-nested.dto.ts

with 771 additions and 307 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