lippuboxi merge (0ca2af47) · 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

0ca2af47

Commit 0ca2af47 authored 5 years ago by Samuli Virtapohja

Downloads
- Plain Diff

lippuboxi merge

parents a5125361 b07986e0

No related branches found

No related tags found

2 merge requests!59Development to master,!20Lippuboksi

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

package-lock.json 9 additions, 4 deletions

package-lock.json
src/game/coordinate.entity.ts 31 additions, 39 deletions

src/game/coordinate.entity.ts
src/game/game.controller.ts 11 additions, 1 deletion

src/game/game.controller.ts
src/game/game.dto.ts 21 additions, 0 deletions

src/game/game.dto.ts
src/game/game.entity.ts 6 additions, 2 deletions

src/game/game.entity.ts
src/game/game.module.ts 19 additions, 2 deletions

src/game/game.module.ts
src/game/game.service.ts 73 additions, 7 deletions

src/game/game.service.ts
src/mapmarkers/mapmarker.entity.ts 13 additions, 13 deletions

src/mapmarkers/mapmarker.entity.ts
src/mapmarkers/mapmarker.service.ts 4 additions, 6 deletions

src/mapmarkers/mapmarker.service.ts
src/notifications/notifications.module.ts 1 addition, 0 deletions

src/notifications/notifications.module.ts
src/shared/roles.controller.ts 45 additions, 45 deletions

src/shared/roles.controller.ts
src/user/user.entity.ts 2 additions, 2 deletions

src/user/user.entity.ts

with 235 additions and 121 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