Merge branch 'RoleAccess' into HEAD (fa63729e) · 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

fa63729e

Commit fa63729e authored 5 years ago by Samuli Virtapohja

Downloads
- Plain Diff

Merge branch 'RoleAccess' into HEAD

parents ccd6dc96 f556c99a

No related branches found

No related tags found

2 merge requests!59Development to master,!19Corrected database and started role controller

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/game/coordinate.entity.ts 13 additions, 1 deletion

src/game/coordinate.entity.ts
src/game/faction.entity.ts 6 additions, 14 deletions

src/game/faction.entity.ts
src/game/game.entity.ts 9 additions, 13 deletions

src/game/game.entity.ts
src/game/game.service.ts 3 additions, 3 deletions

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

src/mapmarkers/mapmarker.entity.ts
src/mapmarkers/mapmarkers.module.ts 2 additions, 2 deletions

src/mapmarkers/mapmarkers.module.ts
src/shared/roles.controller.ts 88 additions, 0 deletions

src/shared/roles.controller.ts
src/user/user.entity.ts 1 addition, 4 deletions

src/user/user.entity.ts

with 127 additions and 41 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