Commits · issueEleven · Joshua Gill / ASE_Y2S1_CP_G4 · GitLab

Snippets Groups Projects

Nov 25, 2021
- Merge branch 'develop' into 'issueEleven' · ff3199f4
  Joshua Gill authored 3 years ago
  ff3199f4
- Merge branch 'issueEleven' into 'develop' · 56d4ee74
  Joshua Gill authored 3 years ago
  56d4ee74
- Maria properties commented out, all tests now passing · 19579c09
  Joshua Gill authored 3 years ago
  
  19579c09
- All Tests except "LoginTests" passing · f09090e3
  Joshua Gill authored 3 years ago
  
  f09090e3
- Merge branch 'issueSeven' into 'develop' · acc525ea
  Seb Barnard authored 3 years ago
  acc525ea
- Merge branch 'issueTwelve' into 'develop' · 70a2eee7
  Seb Barnard authored 3 years ago
  70a2eee7
- Added session functionality to favourite button, now user specific · 2c6a1f92
  Seb Barnard authored 3 years ago
  
  2c6a1f92
- Merge branch 'develop' into 'issueTwelve' · 4f0c8141
  Seb Barnard authored 3 years ago
  4f0c8141
- UserID is now fetched from sessions, linked to business on creation · a4fa6eaa
  Seb Barnard authored 3 years ago
  
  a4fa6eaa
- Merge branch 'develop' into 'issueSeven' · 47d8ebba
  Seb Barnard authored 3 years ago
  47d8ebba
- Merge branch 'develop' into 'issueEleven' · 9b911c9c
  Joshua Gill authored 3 years ago
  9b911c9c
- Merge branch 'issueTen' into 'develop' · 9b1bc9c1
  John Watkins authored 3 years ago
  9b1bc9c1
- Test added to "ShopsTests" to check the right number are fetched when given a CategoryId · 66994238
  Joshua Gill authored 3 years ago
  
  66994238
- Made linking service to link a user to the business they create · bbfa132f
  Seb Barnard authored 3 years ago
  
  bbfa132f
- Fix weird error on "ShopsTest" relating to package structure · b50d5712
  Joshua Gill authored 3 years ago
  
  b50d5712
- Query added to "ShopsRepo" to search by a categoryId · 52bb3337
  Joshua Gill authored 3 years ago
  
  52bb3337
- Merge branch 'develop' into 'issueEleven' · 8da5d60b
  Joshua Gill authored 3 years ago
  8da5d60b
- Merge branch 'develop' into 'issueSeven' · e51e02b5
  Seb Barnard authored 3 years ago
  e51e02b5
- Merge branch 'issueFive' into 'develop' · 4a2644ef
  Seb Barnard authored 3 years ago
  4a2644ef
- Merge branch 'issueFive' of git.cardiff.ac.uk:c2038058/ase_y2s1_cp_g4 into issueFive · 9ced439a
  Seb Barnard authored 3 years ago
  
  9ced439a
- Added redirect controller to potentially fix templating issue · 9bd2f52e
  Seb Barnard authored 3 years ago
  
  9bd2f52e
- Merge branch 'develop' into 'issueFive' · 89023879
  Seb Barnard authored 3 years ago
  89023879
- Added functionality to view shop buttons on index page · 354b7fec
  Seb Barnard authored 3 years ago
  
  354b7fec
- Added data to details page with thymeleaf, needs styling. Removed some redundant print statements · 243f1693
  Seb Barnard authored 3 years ago
  
  243f1693
Nov 24, 2021
- Password Management Fixed · d80f3151
  Joshua Gill authored 3 years ago
  
  d80f3151
- Added controller which adds data to template, not rendered yet · aecf3316
  Seb Barnard authored 3 years ago
  
  aecf3316
- Merge branch 'develop' into issueEleven · 24916344
  Joshua Gill authored 3 years ago
  24916344
- Pushing so I can merge · f179d73a
  Joshua Gill authored 3 years ago
  
  f179d73a
- Merge branch 'issueTwelve' into 'develop' · f0ec127a
  Seb Barnard authored 3 years ago
  f0ec127a
- Added some javadocs to explain code function · cabd504f
  Seb Barnard authored 3 years ago
  
  cabd504f
- Added full favourite button functionality to web page · 0e3a9bdd
  Seb Barnard authored 3 years ago
  
  0e3a9bdd
- Moved log out to the signin controller · 34ba66ed
  John Watkins authored 3 years ago
  
  34ba66ed
- Cleanup and completed utils class · d293b2d2
  John Watkins authored 3 years ago
  
  d293b2d2
- Test refactoring and moving · 9cafecae
  Joshua Gill authored 3 years ago
  
  9cafecae
- More example categories added to the "Schema" files · aa5dabda
  Joshua Gill authored 3 years ago
  
  aa5dabda
- Field added to "Shops" for storing the category · f62a55a8
  Joshua Gill authored 3 years ago
  
  f62a55a8
- Removal of unnecessary "findALl" methods, adding in missing JavaDoc · b86097fe
  Joshua Gill authored 3 years ago
  
  b86097fe
- Merge branch 'develop' into 'issueTwelve' · e57c44d1
  Seb Barnard authored 3 years ago
  e57c44d1
- Merge branch 'develop' into 'issueTen' · c6b2847f
  John Watkins authored 3 years ago
  c6b2847f
- Categories Entity and Repo created · 5051c0ac
  Joshua Gill authored 3 years ago
  
  5051c0ac