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

0abb106a

Commit 0abb106a 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 9e8bf1b9 34706fb5

No related branches found

No related tags found

No related merge requests found

Changes 65

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 4 additions, 0 deletions

.gitignore
.gitlab-ci.yml 1 addition, 1 deletion

.gitlab-ci.yml
images/default.jpeg 0 additions, 0 deletions

images/default.jpeg
package-lock.json 66 additions, 64 deletions

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

package.json
src/app.controller.ts 6 additions, 1 deletion

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

src/app.module.ts
src/draw/coordinate.entity.ts 31 additions, 30 deletions

src/draw/coordinate.entity.ts
src/draw/draw.controller.ts 25 additions, 17 deletions

src/draw/draw.controller.ts
src/draw/draw.module.ts 13 additions, 5 deletions

src/draw/draw.module.ts
src/draw/draw.service.ts 65 additions, 12 deletions

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

src/draw/mapdrawing.dto.ts
src/faction/faction.controller.ts 43 additions, 15 deletions

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

src/faction/faction.dto.ts
src/faction/faction.entity.ts 13 additions, 45 deletions

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

src/faction/faction.module.ts
src/faction/faction.service.ts 121 additions, 34 deletions

src/faction/faction.service.ts
src/game/game.controller.ts 66 additions, 4 deletions

src/game/game.controller.ts
src/game/game.dto.ts 13 additions, 9 deletions

src/game/game.dto.ts
src/game/game.entity.ts 18 additions, 5 deletions

src/game/game.entity.ts

with 539 additions and 265 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