Commits · issueFour · Joshua Gill / ASE_Y2S1_CP_G4

Nov 26, 2021

Merge remote-tracking branch 'origin/issueFour' into issueFour · c078e6b7

# Conflicts:
#	src/main/java/com/example/clientproject/web/controllers/SignUp/SignUpController.java
#	src/main/java/com/example/clientproject/web/controllers/selectCategories/selectCategoriesControllers.java
#	src/test/java/com/example/clientproject/web/controllers/selectFavCategoriesTest.java

c078e6b7

updating branch for refactoringe · a28e754c
Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago
```
Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>
```
a28e754c

Nov 25, 2021
- Updated signUp.html · ba64064c
  Ethan Allen-Harris authored 3 years ago
  
  ba64064c
- Updated signUp.css · b52ce93b
  Ethan Allen-Harris authored 3 years ago
  
  b52ce93b
- fixed broken html for selectCategories.html · f7d6dd42
  Ethan Allen-Harris authored 3 years ago
  
  f7d6dd42
- Added RegisterUserTests file · 76969d37
  Ethan Allen-Harris authored 3 years ago
  
  76969d37
- Merge branch 'develop' into 'issueFour' · 55191d7d
  Ethan Allen-Harris authored 3 years ago
```
Develop

See merge request !46
```
  55191d7d
- Revert "Merge branch 'issueFour' into 'develop'" · e40dc546
  Seb Barnard authored 3 years ago
```
This reverts commit e980a8ba
```
  e40dc546
- Merge branch 'issueFour' into 'develop' · e980a8ba
  Ethan Allen-Harris authored 3 years ago
```
# Conflicts:
#   src/main/java/com/example/clientproject/web/controllers/selectCategories/selectCategoriesControllers.java
```
  e980a8ba
- updating branch for merge · ebb99d0d
  Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago
```
Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>
```
  ebb99d0d
- Merge branch 'issueEleven' into 'develop' · 3922b276
  Joshua Gill authored 3 years ago
```
Issue Complete, merging branch

See merge request !45
```
  3922b276
- Merge branch 'develop' into 'issueEleven' · ff3199f4
  Joshua Gill authored 3 years ago
```
Branch update

See merge request !44
```
  ff3199f4
- Merge branch 'issueEleven' into 'develop' · 56d4ee74
  Joshua Gill authored 3 years ago
```
# Conflicts:
#   src/main/resources/database/Data Script/script.sql
```
  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
```
# Conflicts:
#   src/main/java/com/example/clientproject/web/controllers/HomeController.java
#   src/main/java/com/example/clientproject/web/controllers/SignInController.java
```
  acc525ea
- Merge branch 'issueTwelve' into 'develop' · 70a2eee7
  Seb Barnard authored 3 years ago
```
Issue twelve

See merge request !42
```
  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
```
Develop

See merge request !41
```
  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
```
Develop

See merge request !40
```
  47d8ebba
- Merge branch 'develop' into 'issueFour' · 043ff189
  Ethan Allen-Harris authored 3 years ago
```
Develop

See merge request !39
```
  043ff189
- added some tests (not sure if working) · 2eefb331
  Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago
```
Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>
```
  2eefb331
- Merge branch 'develop' into 'issueEleven' · 9b911c9c
  Joshua Gill authored 3 years ago
```
Branch Update

See merge request !38
```
  9b911c9c
- Merge branch 'issueTen' into 'develop' · 9b1bc9c1
  John Watkins authored 3 years ago
```
Issue ten

See merge request !37
```
  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
```
Branch Update

See merge request !36
```
  8da5d60b
- Merge branch 'develop' into 'issueSeven' · e51e02b5
  Seb Barnard authored 3 years ago
```
Develop

See merge request !35
```
  e51e02b5
- Merge branch 'issueFive' into 'develop' · 4a2644ef
  Seb Barnard authored 3 years ago
```
Redirect controller

See merge request !34
```
  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
```
Develop

See merge request !33
```
  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
```
# Conflicts:
#	src/test/java/com/example/clientproject/data/ShopsTests.java
```
  24916344