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.04Dec32130Nov2928272625242322212018171615119Pushing 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'UserSettings Page - password change functioningMoved image to make it workAdded default colour and image on stamp board creationMerge branch 'develop' of https://git.cardiff.ac.uk/c2038058/ase_y2s1_cp_g4 into developadded imgMerge branch 'issueEighteen' into 'develop'Merge branch 'develop' into 'issueSeventeen'issueSeventeenissueSeventeenfixed positionMerge branch 'issueSeventeen' into 'develop'removed hard coded shopidAdded proper authentication to routeissueEighteenissueEighteendoesn't fall over if user has no link to a stamp boardAdded further functionality, only shows to shop owners nowMerge branch 'issueSeven' into 'develop'Merge branch 'issueSeventeen' into 'develop'Removed stacktrace loggingtext to alert when savedLoading wheel now shows while savingUser email can be inputted, saved to DB from front end and can also be removedrewards now saveBackend now saves colour and stamboard sizeMerge remote-tracking branch 'origin/issueTwentyone' into issueTwentyoneissueTwentyoneissueTwentyoneAdded loading bar and indication message on submissionAdded some files, switching to fix another issueMerge remote-tracking branch 'origin/issueSeven' into issueSevenAdded scrollbar to rewards box, issue that it will be there even if no overflow is occurringMerge remote-tracking branch 'origin/issueSeven' into issueSevenshop's social media's will be shown with correct linking based on whether they have the social media platformMerge branch 'develop' into 'issueSeven'Merge branch 'issueTwentyone' into 'develop'Merge branch 'develop' into 'issueTwentyone'Merge branch 'develop' into 'issueSeven'