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

558d71b4

Commit 558d71b4 authored 4 years ago by Nicolay Schiøll-Johansen

Downloads
- Plain Diff

Merge branch 'improve-view-picture' into 'dev'

Improve view picture

See merge request !152

parents 44da6c7c 8ace6afa

No related branches found

No related tags found

2 merge requests!165Weekly merge to Master,!152Improve view picture

Pipeline #80616 failed 4 years ago

Stage: build

Stage: test

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/NTNU/IDATT1002/controllers/Explore.java 42 additions, 20 deletions

src/main/java/NTNU/IDATT1002/controllers/Explore.java
src/main/java/NTNU/IDATT1002/controllers/ExploreAlbums.java 1 addition, 1 deletion

src/main/java/NTNU/IDATT1002/controllers/ExploreAlbums.java
src/main/java/NTNU/IDATT1002/controllers/Search.java 2 additions, 2 deletions

src/main/java/NTNU/IDATT1002/controllers/Search.java
src/main/java/NTNU/IDATT1002/controllers/ViewAlbum.java 31 additions, 3 deletions

src/main/java/NTNU/IDATT1002/controllers/ViewAlbum.java
src/main/java/NTNU/IDATT1002/controllers/ViewImage.java 46 additions, 15 deletions

src/main/java/NTNU/IDATT1002/controllers/ViewImage.java
src/main/resources/NTNU/IDATT1002/explore.fxml 1 addition, 1 deletion

src/main/resources/NTNU/IDATT1002/explore.fxml
src/main/resources/NTNU/IDATT1002/view_album.fxml 1 addition, 1 deletion

src/main/resources/NTNU/IDATT1002/view_album.fxml
src/main/resources/NTNU/IDATT1002/view_image.fxml 11 additions, 15 deletions

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

with 135 additions and 58 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