Merge branch 'development' into 'drawing-functions' (bcf6681a) · Commits · WIMMA Lab 2019 / Overflow / ehasa-frontend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

ehasa-frontend
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

bcf6681a

Commit bcf6681a authored 5 years ago by M3034

Downloads
- Plain Diff

Merge branch 'development' into 'drawing-functions'

# Conflicts:
#   package.json
#   src/App.js
#   src/components/UserMap.js

parents b05d7a76 f5199bb6

No related branches found

No related tags found

1 merge request!2Drawing functions

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

.dockerignore 2 additions, 0 deletions

.dockerignore
Dockerfile 14 additions, 0 deletions

Dockerfile
package-lock.json 66 additions, 0 deletions

package-lock.json
package.json 3 additions, 0 deletions

package.json
src/App.css 137 additions, 1 deletion

src/App.css
src/App.js 12 additions, 7 deletions

src/App.js
src/components/Header.js 100 additions, 0 deletions

src/components/Header.js
src/components/LoginForm.js 117 additions, 0 deletions

src/components/LoginForm.js
src/components/RegisterForm.js 133 additions, 0 deletions

src/components/RegisterForm.js
src/components/UserMap.js 0 additions, 1 deletion

src/components/UserMap.js
src/index.css 3 additions, 3 deletions

src/index.css
src/index.js 3 additions, 5 deletions

src/index.js

with 590 additions and 17 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