Merge branch 'Development' into 'gamecreation' (8b26709d) · 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

8b26709d

Commit 8b26709d authored 5 years ago by L4721

Downloads
- Plain Diff

Merge branch 'Development' into 'gamecreation'

# Conflicts:
#   src/app.module.ts
#   src/mapmarkers/mapmarkers.controller.ts
#   src/user/user.entity.ts

parents 60d7e75c 93c4a04b

No related branches found

No related tags found

Loading

Changes 12

Expand all Hide whitespace changes

Inline Side-by-side

Showing

package-lock.json 459 additions, 405 deletions

package-lock.json
package.json 5 additions, 1 deletion

package.json
src/app.module.ts 15 additions, 11 deletions

src/app.module.ts
src/mapmarkers/mapmarker.dto.ts 8 additions, 2 deletions

src/mapmarkers/mapmarker.dto.ts
src/mapmarkers/mapmarker.entity.ts 7 additions, 1 deletion

src/mapmarkers/mapmarker.entity.ts
src/mapmarkers/mapmarker.service.ts 10 additions, 1 deletion

src/mapmarkers/mapmarker.service.ts
src/mapmarkers/mapmarkers.controller.ts 3 additions, 3 deletions

src/mapmarkers/mapmarkers.controller.ts
src/mapmarkers/mapmarkers.module.ts 1 addition, 1 deletion

src/mapmarkers/mapmarkers.module.ts
src/notifications/notification.entity.ts 11 additions, 0 deletions

src/notifications/notification.entity.ts
src/notifications/notifications.gateway.ts 53 additions, 0 deletions

src/notifications/notifications.gateway.ts
src/notifications/notifications.module.ts 10 additions, 0 deletions

src/notifications/notifications.module.ts
src/user/user.controller.ts 2 additions, 2 deletions

src/user/user.controller.ts

with 584 additions and 427 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