Feat/explore albums
1 unresolved thread
1 unresolved thread
Implemented dynamic explore album page and linked the buttons to the appropriate album.
Merge request reports
Activity
added 15 commits
-
8319eb1b...46f5cb3c - 4 commits from branch
dev
- e50e042b - Add empty album creation
- d683b042 - Add anonmymous user and userRepository to ApplicationState
- a329aec2 - Add javadoc to CreateAlbumController
- 81ec9f8f - Change App.main back to normal
- 2a76af2b - Move getTagsFromString to imageAlbumService
- 901d0722 - Remove mockito junit dependency
- 1125943d - what even
- 57cd1f62 - Made explore albums page dynamic
- f460bff1 - Gridpane album population
- 463a1457 - Cleaned up Explorecontroller and add javadoc
- e6eb464e - Implemented method to take user to the appropriate album
Toggle commit list-
8319eb1b...46f5cb3c - 4 commits from branch
- Resolved by Eirik Steira
49 47 public void setUp() { 50 48 EntityManagerFactory entityManagerFactory = Persistence.createEntityManagerFactory("ImageApplicationTest"); 51 49 EntityManager entityManager = entityManagerFactory.createEntityManager(); 50 loginRepository = new LoginRepository(entityManager); 52 51 53 id1 = "test1"; 54 id2 = "test2"; 52 username1 = "test1"; 53 username2 = "test2"; 55 54 password = "Test123"; 56 55 newPassword = "Test321"; 57 56 date = new Date(System.currentTimeMillis()); 58 user1 = new User("epost", id1, "fornavn", "etternavn", "test" , "test", date); 59 user2 = new User("epost2" , id2, "fornavn2", "etternavn2", "test2", "test2", date); 57 user1 = new User(username1,"epost","fornavn", "etternavn", "test" , "test", date); changed this line in version 4 of the diff
added 3 commits
-
e6eb464e...ec7c1275 - 2 commits from branch
dev
- de0a7fd0 - Merge branch 'dev' into 'feat/explore-albums'
-
e6eb464e...ec7c1275 - 2 commits from branch
added 1 commit
- a572cec5 - Change user arguments to english in LoginRepositoryTest
mentioned in commit 521ce412
Please register or sign in to reply