Merged branch 'development' into 'notification-view' (dc0cbeed) · 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

dc0cbeed

Commit dc0cbeed authored 5 years ago by Joni Laukka

Downloads
- Plain Diff

Merged branch 'development' into 'notification-view'

parents d978ec7b a3f038ca

No related branches found

No related tags found

2 merge requests!46Development to testing,!41Notifications + small updates

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/App.css 47 additions, 0 deletions

src/App.css
src/components/GameView.js 31 additions, 0 deletions

src/components/GameView.js
src/components/ReplayMap.js 15 additions, 53 deletions

src/components/ReplayMap.js
src/components/TaskItem.js 5 additions, 9 deletions

src/components/TaskItem.js
src/components/UserMap.js 0 additions, 2 deletions

src/components/UserMap.js
src/track-playback/src/control.trackplayback/control.playback.js 26 additions, 10 deletions

...ck-playback/src/control.trackplayback/control.playback.js
src/track-playback/src/leaflet.trackplayback/draw.js 1 addition, 0 deletions

src/track-playback/src/leaflet.trackplayback/draw.js
src/track-playback/src/leaflet.trackplayback/trackcontroller.js 13 additions, 2 deletions

...ack-playback/src/leaflet.trackplayback/trackcontroller.js
src/track-playback/src/leaflet.trackplayback/trackplayback.js 9 additions, 1 deletion

...track-playback/src/leaflet.trackplayback/trackplayback.js

with 147 additions and 77 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