Commits · cecf7c18f819e56c3b7775829ae8d0cdfd72bf1e · Joshua Gill / ASE_Y2S1_CP_G4

Dec 09, 2021
- Added validation to staff member input · cecf7c18
  Seb Barnard authored 3 years ago
  
  cecf7c18
- Added validation to income input · 7aad4cef
  Seb Barnard authored 3 years ago
  
  7aad4cef
- Fixed tab and enter on business register form · 397ce8b1
  Seb Barnard authored 3 years ago
  
  397ce8b1
- All new tags are now saved lowercase · 0630d489
  Seb Barnard authored 3 years ago
  
  0630d489
- Added tags to shops in script · 949358a5
  Seb Barnard authored 3 years ago
  
  949358a5
- Added more functionality to example data script, proper data is now generated · c64319de
  Seb Barnard authored 3 years ago
  
  c64319de
Dec 08, 2021
- Merge branch 'issueThirtyFour' of git.cardiff.ac.uk:c2038058/ase_y2s1_cp_g4 into issueThirtyFour · 5ec908f7
  Seb Barnard authored 3 years ago
  
  5ec908f7
- Added correct scheme · d38b32b5
  Seb Barnard authored 3 years ago
  
  d38b32b5
- Merge branch 'develop' into 'issueThirtyFour' · b0d7fc98
  Seb Barnard authored 3 years ago
```
# Conflicts:
#   src/main/resources/static/js/manageStaff.js
#   src/main/resources/templates/admin.html
#   src/main/resources/templates/fragments/manageStaff.html
```
  b0d7fc98
- Fixed duplicate tags being saved, feature should now be working · 59376b5a
  Seb Barnard authored 3 years ago
  
  59376b5a
- Added Explore link to index · 175d1a44
  John Watkins authored 3 years ago
  
  175d1a44
- Increased width for email to have room · 16651772
  John Watkins authored 3 years ago
  
  16651772
- Made the titles clearer in the settings pages · 06a421cb
  John Watkins authored 3 years ago
  
  06a421cb
- Fully functional form now, files can be uploaded and changes are saved to the database · 68b9b0ca
  Seb Barnard authored 3 years ago
  
  68b9b0ca
- Merge branch 'thirtyFive' into 'develop' · 2fc23dc7
  John Watkins authored 3 years ago
```
Thirty five

See merge request !93
```
  2fc23dc7
- Active shop now shows, clicking the shop takes you to that shop's settings page · 7122c3b1
  John Watkins authored 3 years ago
  
  7122c3b1
- Added fragment, populated and added image upload support (2) · 9150506e
  Seb Barnard authored 3 years ago
  
  9150506e
- Items are now loaded into category dropdowns · f25d885f
  John Watkins authored 3 years ago
  
  f25d885f
- Added fragment, populated and added image upload support · 0c6afa02
  Seb Barnard authored 3 years ago
  
  0c6afa02
- Server now returns the correct info and an animated sidebar has been added in the admin page · ff91fbc6
  John Watkins authored 3 years ago
  
  ff91fbc6
- Merge remote-tracking branch 'origin/develop' into develop · a51942b0
  Joshua Gill authored 3 years ago
  
  a51942b0
- All instances of an email now being set to lowercase, database NOT updated · 8e94d922
  Joshua Gill authored 3 years ago
  
  8e94d922
- Merge branch 'issueThirtyTwo' into 'develop' · a17a59f5
  Joshua Gill authored 3 years ago
```
Issue Complete, merging branch

See merge request !92
```
  a17a59f5
- NavBar images dynamically updating, default profile picture added for all new... · 7b06916f
  Joshua Gill authored 3 years ago
```
NavBar images dynamically updating, default profile picture added for all new users created so the image isn't blank until changed
```
  7b06916f
- Merge branch 'issueThirtyThree' into 'develop' · 3560c9c8
  John Watkins authored 3 years ago
```
Issue thirty three

See merge request !91
```
  3560c9c8
- Finished recommendation system · 65eb5c3c
  John Watkins authored 3 years ago
  
  65eb5c3c
- made shop toggle a bit nicer · 224b6fa4
  Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago
```
Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>
```
  224b6fa4
- Merge branch 'develop' into 'issueThirtyThree' · a8e83611
  John Watkins authored 3 years ago
```
will now successfully hide shops

See merge request !90
```
  a8e83611
- Merge remote-tracking branch 'origin/develop' into develop · 816dbfcc
  Ethan Allen-Harris authored 3 years ago
  
  816dbfcc
- will now successfully hide shops · 0290baf2
  Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago
```
Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>
```
  0290baf2
Dec 07, 2021
- Merge branch 'issueThirtyOne' into 'develop' · 9a37aa59
  Seb Barnard authored 3 years ago
```
Issue thirty one

See merge request !89
```
  9a37aa59
- implemented search bar · 0cce52d7
  Seb Barnard authored 3 years ago
  
  0cce52d7
- Merge branch 'develop' into 'issueThirtyOne' · a467a0cd
  Seb Barnard authored 3 years ago
```
fixed small bug

See merge request !88
```
  a467a0cd
- Merge branch 'develop' into 'issueThirtyThree' · a478d521
  John Watkins authored 3 years ago
```
added non-functional testing (see DeleteShopTests.java for notes) + added serverside validation

See merge request !87
```
  a478d521
- Merge branch 'issueThirtyOne' into 'develop' · f338ceb0
  John Watkins authored 3 years ago
```
Issue thirty one

See merge request !86
```
  f338ceb0
- Fixed the fix · 133a01b8
  John Watkins authored 3 years ago
  
  133a01b8
- Fixed some html errors · ae033797
  Seb Barnard authored 3 years ago
  
  ae033797
- small bugfix · 1a2601a4
  Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago
```
Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>
```
  1a2601a4
- Reversed the list · edc35016
  John Watkins authored 3 years ago
  
  edc35016
- Added a potential fix for no rewards error · 0a0f13df
  Seb Barnard authored 3 years ago
  
  0a0f13df