Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Team 14 - IDATT1002
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

03083c58

Commit 03083c58 authored 5 years ago by Eirik Steira

Downloads
- Plain Diff

Merge branch 'feat/map' into 'dev'

Feat/map

See merge request !120

parents 1f8ac880 2fb56bed

No related branches found

No related tags found

2 merge requests!165Weekly merge to Master,!120Feat/map

Pipeline #79046 passed 5 years ago

Stage: build

Stage: test

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

pom.xml 14 additions, 0 deletions

pom.xml
src/main/java/NTNU/IDATT1002/controllers/ExploreAlbums.java 4 additions, 8 deletions

src/main/java/NTNU/IDATT1002/controllers/ExploreAlbums.java
src/main/java/NTNU/IDATT1002/controllers/ImageMapFactory.java 100 additions, 0 deletions

...main/java/NTNU/IDATT1002/controllers/ImageMapFactory.java
src/main/java/NTNU/IDATT1002/controllers/Map.java 84 additions, 8 deletions

src/main/java/NTNU/IDATT1002/controllers/Map.java
src/main/java/NTNU/IDATT1002/models/Image.java 12 additions, 0 deletions

src/main/java/NTNU/IDATT1002/models/Image.java
src/main/java/NTNU/IDATT1002/service/ImageService.java 2 additions, 5 deletions

src/main/java/NTNU/IDATT1002/service/ImageService.java
src/main/resources/NTNU/IDATT1002/map.fxml 6 additions, 14 deletions

src/main/resources/NTNU/IDATT1002/map.fxml

with 222 additions and 35 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