Skip to content
Snippets Groups Projects
  1. Dec 09, 2023
  2. Dec 08, 2023
  3. Dec 07, 2023
  4. Dec 06, 2023
  5. Dec 05, 2023
    • Connor Brock's avatar
      Merge remote-tracking branch 'origin/main' into QRCodes · 6ebdb676
      Connor Brock authored
      # Conflicts:
      #	src/main/java/Team5/SmartTowns/trails/TrailsController.java
      #	src/main/resources/data.sql
      6ebdb676
    • Rhys Evans's avatar
    • Gabriel Copat's avatar
      Updating style for mobile phones · 900728ad
      Gabriel Copat authored
      900728ad
    • Gabriel Copat's avatar
      Merge remote-tracking branch... · 55c21470
      Gabriel Copat authored
      Merge remote-tracking branch 'origin/73-as-a-qr-scanning-connoisseur-i-want-to-unlock-stickers-after-scanning-a-qr-code-to-feel-a-sense' 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/rewards/Badge.java
      #	src/main/java/team5/smartTowns/rewards/Reward.java
      #	src/main/java/team5/smartTowns/rewards/RewardsController.java
      #	src/main/java/team5/smartTowns/rewards/Sticker.java
      #	src/main/java/team5/smartTowns/rewards/data/BadgesRepository.java
      #	src/main/java/team5/smartTowns/rewards/data/BadgesRepositoryJDBC.java
      #	src/main/java/team5/smartTowns/rewards/data/StickersRepository.java
      #	src/main/java/team5/smartTowns/rewards/data/StickersRepositoryJDBC.java
      55c21470
Loading