Skip to content
Snippets Groups Projects

Repository graph

You can move around the graph by using the arrow keys.
Select Git revision
  • 18-i-want-to-be-able-to-manage-shop-staff
  • IssueSix
  • develop
  • issue2
  • issueEighteen
  • issueEleven
  • issueFifteen
  • issueFive
  • issueFour
  • issueNine
  • issueNineteen
  • issueOne
  • issueSeven
  • issueSeventeen
  • issueTen
  • issueThirty
  • issueThirtyEight
  • issueThirtyFour
  • issueThirtyNine
  • issueThirtyOne
20 results
Created with Raphaël 2.2.07Dec65432130Nov2928272625242322212018171615119All required fields changed so password is hidden, all functionality still workingissueTwentySevenissueTwentySevenMerge branch 'issueSeven' into 'develop'Merge branch 'issueNineteen' into 'develop'Added javaDoc and added a working test for changing shop activityissueTwentyTwoissueTwentyTwoUnused test classes removedissueNineteenissueNineteenAll Functionality added, all required fields can be updated using the Settings page, no 2FA altering addedSort list of hashmaps based on relevanceWeights are now scaled to the amount of stamps a user hasUser can toggle thier own shop nowAdded correct styling, prevents shops showing twice. Should be functionalAdded route to calculate weights based on user favourite tags and their starred shopsUpdate viewShop.css to fix formatting issueissueSevenissueSevenMerge remote-tracking branch 'origin/issueSeven' into issueSevenchanged view shop to flex, needs a little more styling to make shop details box at left of screenImplemented page, shows favourite shops. Need example stamps to try current user stampsMerge branch 'develop' of https://git.cardiff.ac.uk/c2038058/ase_y2s1_cp_g4 into developAdded search to user rewardsfixed issue where had to submit twiceadded javaDocwill redirect to "whoops no business" pageadded non-functional testing (see DeleteShopTests.java for notes) + added serverside validationfixed hard coding issue (only got stamp position of userID=1)Merge remote-tracking branch 'origin/issueTwentyThree' into issueTwentyThreeMerge branch 'develop' into 'issueTwentyThree'removed loggingMerge branch 'issueSeven' into issueTwentyThreeadded missing html fragmentfixed small bugMerge remote-tracking branch 'origin/issueTwentyThree' into issueTwentyThreecan successfully delete shop + small bugfixesMerge branch 'develop' into 'issueNineteen'Fixed issue where a non admin wouldnt be able to access the settings pagePushing so others can check problemsFix issue with no forms in the "userSettins" pageMerge remote-tracking branch 'origin/issueSeven' into issueSevensmall css changes + added navbarMerge remote-tracking branch 'origin/issueSeven' into issueSevencss+html changes to make buttons stand out and easier for all colorsMerge branch 'develop' into 'issueNineteen'Merge branch 'issueNineteen' into 'develop'