Merge branch 'Development' into 'master' (a315a422) · 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

a315a422

Commit a315a422 authored 5 years ago by L4721

Downloads
- Plain Diff

Merge branch 'Development' into 'master'

Development to master

See merge request !59

parents d4988b47 4e8186cb

No related branches found

No related tags found

Loading

Changes 85

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.dockerignore 2 additions, 1 deletion

.dockerignore
.gitignore 5 additions, 1 deletion

.gitignore
.gitlab-ci.yml 41 additions, 0 deletions

.gitlab-ci.yml
Dockerfile 4 additions, 3 deletions

Dockerfile
README.md 30 additions, 3 deletions

README.md
docker-compose.yml 6 additions, 10 deletions

docker-compose.yml
images/default.jpeg 0 additions, 0 deletions

images/default.jpeg
ormconfig.json.example 11 additions, 11 deletions

ormconfig.json.example
package-lock.json 577 additions, 582 deletions

package-lock.json
package.json 11 additions, 7 deletions

package.json
src/app.controller.spec.ts 0 additions, 22 deletions

src/app.controller.spec.ts
src/app.controller.ts 6 additions, 1 deletion

src/app.controller.ts
src/app.module.ts 58 additions, 12 deletions

src/app.module.ts
src/coordinate/coordinate.entity.ts 0 additions, 15 deletions

src/coordinate/coordinate.entity.ts
src/draw/coordinate.entity.ts 52 additions, 0 deletions

src/draw/coordinate.entity.ts
src/draw/draw.controller.ts 50 additions, 0 deletions

src/draw/draw.controller.ts
src/draw/draw.module.ts 32 additions, 0 deletions

src/draw/draw.module.ts
src/draw/draw.service.ts 99 additions, 0 deletions

src/draw/draw.service.ts
src/draw/mapdrawing.dto.ts 16 additions, 0 deletions

src/draw/mapdrawing.dto.ts
src/faction/faction.controller.ts 126 additions, 0 deletions

src/faction/faction.controller.ts

with 1126 additions and 668 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