Skip to content
Snippets Groups Projects
Select Git revision
  • Gabes-testing-branch
  • main default protected
  • 81-as-a-child-i-want-a-very-flashy-and-modern-looking-webpage-that-will-draw-me-in-and-keep-me
  • locationApporvalFormValidationUpdate
  • 74-as-a-user-i-want-to-see-a-page-of-local-authorities-so-that-i-can-easily-source-contact-details
  • businesses
  • 77-as-a-user-i-want-to-be-able-to-use-the-application-on-any-device-e-g-iphone-ipad-laptop
  • 69-as-a-user-i-would-like-a-town-specific-page-which-shows-all-trails-for-that-town-so-that-i-can
  • 80-as-a-convenience-enthusiast-i-want-a-drop-down-menu-to-be-able-to-quickly-scan-qr-codes-i-find
  • 82-as-a-site-admininstrator-i-want-to-be-able-to-review-submited-trail-checkpoints-by-bussiness
  • 68-as-a-user-i-would-like-to-see-a-map-containing-all-landmarks-for-a-trail-and-a-suggested-path
  • 70-as-a-repeat-trail-visitor-i-want-to-be-able-to-create-an-account-so-i-can-save-and-review-my
  • towns
  • DTFrontEnd
  • 52-as-a-user-i-would-like-to-see-a-map-of-the-landmarks-so-that-i-can-figure-out-where-to-go
  • 73-as-a-qr-scanning-connoisseur-i-want-to-unlock-stickers-after-scanning-a-qr-code-to-feel-a-sense
  • QRCodes
  • consumers
  • foreignkeys
  • cleanup
20 results
Compare History
Gabriel Copat's avatar
Merge branch 'main' into...
Gabriel Copat authored 
Merge branch 'main' into 73-as-a-qr-scanning-connoisseur-i-want-to-unlock-stickers-after-scanning-a-qr-code-to-feel-a-sense

# Conflicts:
#	src/main/java/Team5/SmartTowns/data/MockUser.java
#	src/main/java/Team5/SmartTowns/data/QRCodes.java
#	src/main/java/Team5/SmartTowns/trails/TrailsController.java
#	src/main/java/Team5/SmartTowns/users/User.java
#	src/main/java/Team5/SmartTowns/users/UserRepository.java
#	src/main/java/Team5/SmartTowns/users/UserRepositoryJDBC.java
#	src/main/resources/data.sql
#	src/main/resources/schema.sql
b3a76168
Name Last commit Last update
..
css
images
scripts
qr-scanner.html