added buttons to increase/decrease stamp position

See merge request !98

Added better example data to table populator script

See merge request !97

Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago

Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>

merge into develop

See merge request !96

Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago

Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>

Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago

increase/decrease buttons only show up if user is shop admin, and added reward code pop-up upon claim

Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>

Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago

Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>

Issue thirty four

See merge request !95

Issue thirty four

See merge request !94

# Conflicts:
#   src/main/resources/static/js/manageStaff.js
#   src/main/resources/templates/admin.html
#   src/main/resources/templates/fragments/manageStaff.html

Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago

Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>

Thirty five

See merge request !93

Issue Complete, merging branch

See merge request !92

NavBar images dynamically updating, default profile picture added for all new users created so the image isn't blank until changed

Issue thirty three

See merge request !91

Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago

Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>