Commits · issueThirtyThree · Joshua Gill / ASE_Y2S1_CP_G4 · GitLab

Snippets Groups Projects

Dec 08, 2021
- Finished recommendation system · 65eb5c3c
  John Watkins authored 3 years ago
  
  65eb5c3c
- Merge branch 'develop' into 'issueThirtyThree' · a8e83611
  John Watkins authored 3 years ago
  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
  0290baf2
Dec 07, 2021
- Merge branch 'issueThirtyOne' into 'develop' · 9a37aa59
  Seb Barnard authored 3 years ago
  9a37aa59
- implemented search bar · 0cce52d7
  Seb Barnard authored 3 years ago
  
  0cce52d7
- Merge branch 'develop' into 'issueThirtyOne' · a467a0cd
  Seb Barnard authored 3 years ago
  a467a0cd
- Merge branch 'develop' into 'issueThirtyThree' · a478d521
  John Watkins authored 3 years ago
  a478d521
- Merge branch 'issueThirtyOne' into 'develop' · f338ceb0
  John Watkins authored 3 years ago
  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
  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
- Merge branch 'issueTwentyThree' into 'develop' · 79814b71
  Ethan Allen-Harris authored 3 years ago
  79814b71
- Merge branch 'develop' into 'issueTwentyThree' · 57776ea7
  Ethan Allen-Harris authored 3 years ago
  57776ea7
- fixed broken social media links, business website potentially still not working · 80767a7f
  Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago
  80767a7f
- Merge branch 'develop' into 'issueThirtyThree' · cd440123
  John Watkins authored 3 years ago
  cd440123
- Merge branch 'issueThirtyThree' into 'develop' · 51a0949b
  John Watkins authored 3 years ago
  51a0949b
- Merge branch 'issueThirtyOne' into 'develop' · 03951b2a
  Seb Barnard authored 3 years ago
  03951b2a
- Purchased stamps now load star if favourited too, corrected home page to load data correctly. · 7d14f803
  Seb Barnard authored 3 years ago
  
  7d14f803
- Merge branch 'issueTwentySeven' into 'develop' · 41e44053
  Joshua Gill authored 3 years ago
  41e44053
- Merge branch 'issueTwentyTwo' into 'develop' · ebcbf1f0
  Ethan Allen-Harris authored 3 years ago
  ebcbf1f0
- All required fields changed so password is hidden, all functionality still working · f64d6072
  Joshua Gill authored 3 years ago
  
  f64d6072
- Merge branch 'issueSeven' into 'develop' · 5c9d5aee
  Ethan Allen-Harris authored 3 years ago
  5c9d5aee
- Merge branch 'issueNineteen' into 'develop' · c8f99567
  Joshua Gill authored 3 years ago
  c8f99567
- Added javaDoc and added a working test for changing shop activity · 4185db8b
  Ethan Allen-Harris authored 3 years ago
  4185db8b
- Unused test classes removed · 7299fae5
  Joshua Gill authored 3 years ago
  
  7299fae5
- All Functionality added, all required fields can be updated using the Settings... · 3f18ad6a
  Joshua Gill authored 3 years ago
  3f18ad6a
- Sort list of hashmaps based on relevance · 773e7574
  John Watkins authored 3 years ago
  
  773e7574
- Weights are now scaled to the amount of stamps a user has · e54f78c5
  John Watkins authored 3 years ago
  
  e54f78c5
- User can toggle thier own shop now · 20570be8
  Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago
  20570be8
- Added correct styling, prevents shops showing twice. Should be functional · 4321743a
  Seb Barnard authored 3 years ago
  
  4321743a
- Added route to calculate weights based on user favourite tags and their starred shops · b30131aa
  John Watkins authored 3 years ago
  
  b30131aa
- Update viewShop.css to fix formatting issue · 10f89172
  Ethan Allen-Harris authored 3 years ago
  
  10f89172
- Merge remote-tracking branch 'origin/issueSeven' into issueSeven · 24fce26c
  Ethan Allen-Harris authored 3 years ago
  
  24fce26c
- changed view shop to flex, needs a little more styling to make shop details box at left of screen · b0f11de6
  Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago
  b0f11de6
- Implemented page, shows favourite shops. Need example stamps to try current user stamps · a3d9d3d0
  Seb Barnard authored 3 years ago
  
  a3d9d3d0
Dec 06, 2021
- Merge branch 'develop' of https://git.cardiff.ac.uk/c2038058/ase_y2s1_cp_g4 into develop · bc0f83e7
  John Watkins authored 3 years ago
  
  bc0f83e7
- Added search to user rewards · e6a5b01d
  John Watkins authored 3 years ago
  
  e6a5b01d