Commits · issueThirtyFour · Joshua Gill / ASE_Y2S1_CP_G4 · GitLab

Snippets Groups Projects

Dec 09, 2021
- Merge branch 'develop' into 'issueThirtyFour' · 826a5924
  Seb Barnard authored Dec 9, 2021
  826a5924
- Fixed border on keyinformation panel · 3cfeff6a
  Seb Barnard authored Dec 9, 2021
  
  3cfeff6a
- Removed borders on email fields · 108ecef3
  Seb Barnard authored Dec 9, 2021
  
  108ecef3
- Added validation to tags field, no longer causes error due to blank input · c316ab53
  Seb Barnard authored Dec 9, 2021
  
  c316ab53
- Fixed staff member validation, changed some redirects to be up to date · 8a4c01a1
  Seb Barnard authored Dec 9, 2021
  
  8a4c01a1
- Merge branch 'issueThirtyNine' into 'develop' · d5ed9154
  Joshua Gill authored Dec 9, 2021
  d5ed9154
- Removed un-needed duplicate fields from tables causing bootrun to fail · 75623d97
  Joshua Gill authored Dec 9, 2021
  
  75623d97
- Merge branch 'issueThirtyNine' into 'develop' · 3ba4e288
  Joshua Gill authored Dec 9, 2021
  3ba4e288
- Added validation to staff member input · cecf7c18
  Seb Barnard authored Dec 9, 2021
  
  cecf7c18
- ALteration of file so it generates data correctly · a440f510
  Joshua Gill authored Dec 9, 2021
  
  a440f510
- Added validation to income input · 7aad4cef
  Seb Barnard authored Dec 9, 2021
  
  7aad4cef
- Re-upload of replaced inserts to new table due to merge conflicts · d99f52bb
  Joshua Gill authored Dec 9, 2021
  
  d99f52bb
- Merge branch 'develop' into 'issueThirtyNine' · 4b7aa540
  Joshua Gill authored Dec 9, 2021
  4b7aa540
- Merge branch 'issueThirtyNine' into 'develop' · bc7a9916
  Joshua Gill authored Dec 9, 2021
  bc7a9916
- LoggingService service class, new method to add a log to the "Logs" table when... · f2137334
  Joshua Gill authored Dec 9, 2021
  f2137334
- New Entities Repos for Logs and Events, all other required entities updated with new data · bfe0f438
  Joshua Gill authored Dec 9, 2021
  
  bfe0f438
- Schemas updated to include the new tables, as well as the Events examples · acc1dfc3
  Joshua Gill authored Dec 9, 2021
  
  acc1dfc3
- Fixed tab and enter on business register form · 397ce8b1
  Seb Barnard authored Dec 9, 2021
  
  397ce8b1
- All new tags are now saved lowercase · 0630d489
  Seb Barnard authored Dec 9, 2021
  
  0630d489
- Merge branch 'issueThirtyFour' into 'develop' · 31484c40
  Seb Barnard authored Dec 9, 2021
  31484c40
- Added tags to shops in script · 949358a5
  Seb Barnard authored Dec 9, 2021
  
  949358a5
- Added more functionality to example data script, proper data is now generated · c64319de
  Seb Barnard authored Dec 9, 2021
  
  c64319de
- small bugfix to reward card · a3bfde8f
  Ethan Allen-Harris authored Dec 9, 2021 and Ethan Allen-Harris committed Dec 9, 2021
  a3bfde8f
Dec 08, 2021
- Merge branch 'issueThirtyEight' into 'develop' · d9953bf9
  Ethan Allen-Harris authored Dec 8, 2021
  d9953bf9
- fixed issue where new user could not increment stamp pos on own shop · 0e13452b
  Ethan Allen-Harris authored Dec 8, 2021 and Ethan Allen-Harris committed Dec 8, 2021
  0e13452b
- increase/decrease buttons only show up if user is shop admin, and added reward... · f378a01a
  Ethan Allen-Harris authored Dec 8, 2021 and Ethan Allen-Harris committed Dec 8, 2021
  f378a01a
- added buttons to increase/decrease stamp position · a2545f41
  Ethan Allen-Harris authored Dec 8, 2021 and Ethan Allen-Harris committed Dec 8, 2021
  a2545f41
- Allow you to go to settings as a non-shop owner · 238a4a7c
  John Watkins authored Dec 8, 2021
  
  238a4a7c
- Merge branch 'issueThirtyFour' into 'develop' · 39dad418
  Seb Barnard authored Dec 8, 2021
  39dad418
- Merge branch 'issueThirtyFour' of git.cardiff.ac.uk:c2038058/ase_y2s1_cp_g4 into issueThirtyFour · 5ec908f7
  Seb Barnard authored Dec 8, 2021
  
  5ec908f7
- Added correct scheme · d38b32b5
  Seb Barnard authored Dec 8, 2021
  
  d38b32b5
- Merge branch 'issueThirtyFour' into 'develop' · 48372f84
  Seb Barnard authored Dec 8, 2021
  48372f84
- Merge branch 'develop' into 'issueThirtyFour' · b0d7fc98
  Seb Barnard authored Dec 8, 2021
  b0d7fc98
- Fixed duplicate tags being saved, feature should now be working · 59376b5a
  Seb Barnard authored Dec 8, 2021
  
  59376b5a
- added buttons to increase/decrease stamp position · 0da0b1f1
  Ethan Allen-Harris authored Dec 8, 2021 and Ethan Allen-Harris committed Dec 8, 2021
  0da0b1f1
- Added Explore link to index · 175d1a44
  John Watkins authored Dec 8, 2021
  
  175d1a44
- Increased width for email to have room · 16651772
  John Watkins authored Dec 8, 2021
  
  16651772
- Made the titles clearer in the settings pages · 06a421cb
  John Watkins authored Dec 8, 2021
  
  06a421cb
- Fully functional form now, files can be uploaded and changes are saved to the database · 68b9b0ca
  Seb Barnard authored Dec 8, 2021
  
  68b9b0ca
- Merge branch 'thirtyFive' into 'develop' · 2fc23dc7
  John Watkins authored Dec 8, 2021
  2fc23dc7