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.09Dec8765432130Nov2928272625242322212018171615119All new tags are now saved lowercaseMerge branch 'develop' into 'issueThirty'Added rest controller route to search for shopsMerge branch 'issueThirtyFour' into 'develop'Added tags to shops in scriptAdded more functionality to example data script, proper data is now generatedsmall bugfix to reward cardMerge branch 'issueThirtyEight' into 'develop'fixed issue where new user could not increment stamp pos on own shopissueThirtyEightissueThirtyEightincrease/decrease buttons only show up if user is shop admin, and added reward code pop-up upon claimadded buttons to increase/decrease stamp positionAllow you to go to settings as a non-shop ownerMerge branch 'issueThirtyFour' into 'develop'Merge branch 'issueThirtyFour' of git.cardiff.ac.uk:c2038058/ase_y2s1_cp_g4 into issueThirtyFourAdded correct schemeMerge branch 'issueThirtyFour' into 'develop'Merge branch 'develop' into 'issueThirtyFour'Fixed duplicate tags being saved, feature should now be workingadded buttons to increase/decrease stamp positionAdded Explore link to indexIncreased width for email to have roomMade the titles clearer in the settings pagesFully functional form now, files can be uploaded and changes are saved to the databaseMerge branch 'thirtyFive' into 'develop'Active shop now shows, clicking the shop takes you to that shop's settings pagethirtyFivethirtyFiveAdded fragment, populated and added image upload support (2)Items are now loaded into category dropdownsAdded fragment, populated and added image upload supportServer now returns the correct info and an animated sidebar has been added in the admin pageMerge remote-tracking branch 'origin/develop' into developAll instances of an email now being set to lowercase, database NOT updatedMerge branch 'issueThirtyTwo' into 'develop'NavBar images dynamically updating, default profile picture added for all new users created so the image isn't blank until changedissueThirtyTwoissueThirtyTwoMerge branch 'issueThirtyThree' into 'develop'Finished recommendation systemissueThirtyThreeissueThirtyThreemade shop toggle a bit nicerMerge branch 'develop' into 'issueThirtyThree'Merge remote-tracking branch 'origin/develop' into developwill now successfully hide shopsMerge branch 'issueThirtyOne' into 'develop'