Skip to content
Snippets Groups Projects
  1. Dec 13, 2023
  2. Dec 12, 2023
  3. Dec 11, 2023
  4. Dec 10, 2023
  5. Dec 09, 2023
  6. Dec 08, 2023
  7. Dec 07, 2023
    • Gabriel Copat's avatar
      Bugfixes · 9ec8ccb8
      Gabriel Copat authored
      9ec8ccb8
    • Gabriel Copat's avatar
      Merge branch 'main' into... · b3a76168
      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
    • Rhys Evans's avatar
      Merge branch 'QRCodes' into 'main' · a9ddc9f2
      Rhys Evans authored
      Qr codes
      
      Closes #49
      
      See merge request !27
      a9ddc9f2
    • Connor Brock's avatar
      Commented out code for URL query string integration to get a functioning QR... · 8f2bf6a3
      Connor Brock authored
      Commented out code for URL query string integration to get a functioning QR code scanner for presentation
      8f2bf6a3
Loading