Commits · issueTwentyone · Joshua Gill / ASE_Y2S1_CP_G4 · GitLab

Snippets Groups Projects

Dec 03, 2021
- Merge remote-tracking branch 'origin/issueTwentyone' into issueTwentyone · 24e1657a
  Seb Barnard authored Dec 3, 2021
  24e1657a
- Added loading bar and indication message on submission · 5d48b8bd
  Seb Barnard authored Dec 3, 2021
  
  5d48b8bd
Dec 02, 2021
- Merge branch 'develop' into 'issueTwentyone' · 2d4f9e15
  Seb Barnard authored Dec 2, 2021
  2d4f9e15
- Merge branch 'issueSeven' into 'develop' · 005c52d3
  Ethan Allen-Harris authored Dec 2, 2021
  005c52d3
- Test doesnt work, pushing so i can work on a new issue · e94f853d
  Seb Barnard authored Dec 2, 2021
  
  e94f853d
- Merge branch 'issueFifteen' into 'develop' · bed6ae83
  Joshua Gill authored Dec 2, 2021
  bed6ae83
- All Tests Passing · 2eb1eec6
  Joshua Gill authored Dec 2, 2021
  
  2eb1eec6
- Merge remote-tracking branch 'origin/issueSeven' into issueSeven · ad4d4481
  Ethan Allen-Harris authored Dec 2, 2021
  ad4d4481
- added shop icon/stamp to stampboard · ea310052
  Ethan Allen-Harris authored Dec 2, 2021 and Ethan Allen-Harris committed Dec 2, 2021
  ea310052
- can successfully view all information required for shop details, scroll bar... · 8e7f48d2
  Ethan Allen-Harris authored Dec 2, 2021 and Ethan Allen-Harris committed Dec 2, 2021
  8e7f48d2
- Pushing so Carl can help · b060ccfa
  Joshua Gill authored Dec 2, 2021
  
  b060ccfa
Dec 01, 2021
- got stamp board to load user stamp progress · 1da69a50
  Ethan Allen-Harris authored Dec 1, 2021 and Ethan Allen-Harris committed Dec 1, 2021
  1da69a50
- Merge branch 'issueTwentyone' of git.cardiff.ac.uk:c2038058/ase_y2s1_cp_g4 into issueTwentyone · 2d089b92
  Seb Barnard authored Dec 1, 2021
  
  2d089b92
- User is now authenticated on post request, all fields functional on client... · 82be87d9
  Seb Barnard authored Dec 1, 2021
  82be87d9
- Merge branch 'issueSeventeen' into 'issueTwentyone' · 3777328a
  Seb Barnard authored Dec 1, 2021
  3777328a
- Reward text now loads into inputs on admin page · d70de6aa
  John Watkins authored Dec 1, 2021
  
  d70de6aa
- Merge branch 'issueSeventeen' into 'issueTwentyone' · e523aa34
  Seb Barnard authored Dec 1, 2021
  e523aa34
- Added reward name from id · 3eca39d9
  John Watkins authored Dec 1, 2021
  
  3eca39d9
- Merge branch 'issueTwentyone' of git.cardiff.ac.uk:c2038058/ase_y2s1_cp_g4 into issueTwentyone · dc8f9a72
  Seb Barnard authored Dec 1, 2021
  
  dc8f9a72
- Added ability to update social links on button press, pushing for merge for thymeleaf page · 918ed3b4
  Seb Barnard authored Dec 1, 2021
  
  918ed3b4
- allows url param to go directly to a tab · 916b559d
  John Watkins authored Dec 1, 2021
  
  916b559d
- Moved dynamic card to a fragment · d12e9438
  John Watkins authored Dec 1, 2021
  
  d12e9438
- Added dynamic loading of stampboards through thymeleaf · 8362ddc5
  John Watkins authored Dec 1, 2021
  
  8362ddc5
- Merge branch 'issueTwentyone' into 'issueSeven' · b5aa369e
  Seb Barnard authored Dec 1, 2021
  b5aa369e
- Merge branch 'issueSeven' into 'issueTwentyone' · 9bfb6c94
  Seb Barnard authored Dec 1, 2021
  9bfb6c94
- Added actual shop stampboard to shopdetails page · f05cdec9
  Seb Barnard authored Dec 1, 2021
  
  f05cdec9
- Fixed linking shop to stamp board · c7315c81
  Seb Barnard authored Dec 1, 2021
  
  c7315c81
- Merge branch 'issueSeventeen' into 'issueSeven' · de9e2d91
  Ethan Allen-Harris authored Dec 1, 2021
  de9e2d91
- update · eb61d0f1
  John Watkins authored Dec 1, 2021
  
  eb61d0f1
- Example stamp board is now created on shop registration · 76848cd9
  Seb Barnard authored Dec 1, 2021
  
  76848cd9
- Merge branch 'issueSeven' into 'issueSeventeen' · 9c1daf43
  John Watkins authored Dec 1, 2021
  9c1daf43
- updating viewshop · aab61166
  Ethan Allen-Harris authored Nov 30, 2021 and Ethan Allen-Harris committed Dec 1, 2021
  aab61166
Nov 30, 2021
- SignUp Tests working, selectCategories needs testing, failing test in "FavouriteBusiness" tests · cf2467fc
  Joshua Gill authored Nov 30, 2021
  
  cf2467fc
- Added icon and colour to stampboard table · b272a9c1
  John Watkins authored Nov 30, 2021
  
  b272a9c1
- Added stampboard link to admin page · 1168e314
  John Watkins authored Nov 30, 2021
  
  1168e314
- Pushing so Carl can help with fixing failing tests · ea6fec04
  Joshua Gill authored Nov 30, 2021
  
  ea6fec04
- Fixed some bugs and all social information is now saved to the database and linked with jpa · e2023e26
  Seb Barnard authored Nov 30, 2021
  
  e2023e26
- Changed way we handle permission levels on admin page · dc109012
  John Watkins authored Nov 30, 2021
  
  dc109012
- Merge remote-tracking branch 'origin/issueFifteen' into issueFifteen · f48abe24
  Joshua Gill authored Nov 30, 2021
  
  f48abe24
- Pushing so Carl can help with fixing failing tests · 9af53978
  Joshua Gill authored Nov 30, 2021
  
  9af53978