Merge branch 'Development' of... (f647667e) · 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

f647667e

Commit f647667e authored 5 years ago by L4168

Downloads
- Plain Diff

Merge branch 'Development' of...

Merge branch 'Development' of gitlab.labranet.jamk.fi:wimma-lab-2019/overflow/ehasa-backend into Development

parents cf32a8a1 dc358f6c

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

package-lock.json 77 additions, 89 deletions

package-lock.json
package.json 1 addition, 1 deletion

package.json
src/faction/faction.dto.ts 3 additions, 0 deletions

src/faction/faction.dto.ts
src/faction/faction.entity.ts 6 additions, 0 deletions

src/faction/faction.entity.ts
src/replay/replay.controller.ts 9 additions, 2 deletions

src/replay/replay.controller.ts
src/replay/replay.module.ts 8 additions, 2 deletions

src/replay/replay.module.ts
src/replay/replay.service.ts 55 additions, 25 deletions

src/replay/replay.service.ts
src/score/score.service.ts 2 additions, 1 deletion

src/score/score.service.ts
src/shared/roles.guard.ts 1 addition, 1 deletion

src/shared/roles.guard.ts
src/tracking/tracking.service.ts 10 additions, 1 deletion

src/tracking/tracking.service.ts

with 172 additions and 122 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