Merge branch 'Development' into 'TypeORM'
# Conflicts: # src/app.module.ts # src/game/game.controller.ts # src/game/game.dto.ts # src/game/game.entity.ts # src/game/game.module.ts # src/game/game.service.ts # src/user/user.controller.ts # src/user/user.entity.ts
No related branches found
No related tags found
Showing
- README.md 30 additions, 3 deletionsREADME.md
- docker-compose.yml 1 addition, 1 deletiondocker-compose.yml
- package-lock.json 478 additions, 405 deletionspackage-lock.json
- package.json 5 additions, 1 deletionpackage.json
- src/app.controller.spec.ts 0 additions, 22 deletionssrc/app.controller.spec.ts
- src/app.module.ts 16 additions, 10 deletionssrc/app.module.ts
- src/game/game.controller.ts 3 additions, 3 deletionssrc/game/game.controller.ts
- src/game/game.entity.ts 39 additions, 25 deletionssrc/game/game.entity.ts
- src/game/game.module.ts 1 addition, 2 deletionssrc/game/game.module.ts
- src/game/game.service.spec.ts 18 additions, 0 deletionssrc/game/game.service.spec.ts
- src/game/game.service.ts 22 additions, 21 deletionssrc/game/game.service.ts
- src/mapmarkers/mapmarker.dto.ts 8 additions, 2 deletionssrc/mapmarkers/mapmarker.dto.ts
- src/mapmarkers/mapmarker.entity.ts 7 additions, 1 deletionsrc/mapmarkers/mapmarker.entity.ts
- src/mapmarkers/mapmarker.service.ts 11 additions, 2 deletionssrc/mapmarkers/mapmarker.service.ts
- src/mapmarkers/mapmarkers.controller.ts 2 additions, 2 deletionssrc/mapmarkers/mapmarkers.controller.ts
- src/mapmarkers/mapmarkers.module.ts 1 addition, 1 deletionsrc/mapmarkers/mapmarkers.module.ts
- src/notifications/notification.entity.ts 11 additions, 0 deletionssrc/notifications/notification.entity.ts
- src/notifications/notifications.gateway.ts 53 additions, 0 deletionssrc/notifications/notifications.gateway.ts
- src/notifications/notifications.module.ts 10 additions, 0 deletionssrc/notifications/notifications.module.ts
- src/shared/array-validation.ts 17 additions, 0 deletionssrc/shared/array-validation.ts
Loading
Please register or sign in to comment