Merge branch 'main' into...
Merge branch 'main' into 77-as-a-user-i-want-to-be-able-to-use-the-application-on-any-device-e-g-iphone-ipad-laptop # Conflicts: # src/main/java/Team5/SmartTowns/data/TrailsRepository.java # src/main/java/Team5/SmartTowns/data/TrailsRepositoryJDBC.java # src/main/java/Team5/SmartTowns/landmarks/LandmarksController.java # src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesController.java # src/main/resources/static/css/homePageStyle.css # src/test/java/Team5/SmartTownsOld/DatasourceConfig.java # src/test/java/Team5/SmartTownsOld/users/UserTests.java
No related tags found
Showing
- src/main/java/Team5/SmartTowns/data/DatabaseController.java 37 additions, 0 deletionssrc/main/java/Team5/SmartTowns/data/DatabaseController.java
- src/main/java/Team5/SmartTowns/data/Location.java 9 additions, 0 deletionssrc/main/java/Team5/SmartTowns/data/Location.java
- src/main/java/Team5/SmartTowns/data/LocationRepository.java 3 additions, 0 deletionssrc/main/java/Team5/SmartTowns/data/LocationRepository.java
- src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java 12 additions, 0 deletions...in/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java
- src/main/java/Team5/SmartTowns/data/MockUser.java 0 additions, 16 deletionssrc/main/java/Team5/SmartTowns/data/MockUser.java
- src/main/java/Team5/SmartTowns/data/QRCodes.java 0 additions, 4 deletionssrc/main/java/Team5/SmartTowns/data/QRCodes.java
- src/main/java/Team5/SmartTowns/data/Town.java 20 additions, 0 deletionssrc/main/java/Team5/SmartTowns/data/Town.java
- src/main/java/Team5/SmartTowns/data/TownRepository.java 8 additions, 0 deletionssrc/main/java/Team5/SmartTowns/data/TownRepository.java
- src/main/java/Team5/SmartTowns/data/TownRepositoryJDBC.java 37 additions, 0 deletionssrc/main/java/Team5/SmartTowns/data/TownRepositoryJDBC.java
- src/main/java/Team5/SmartTowns/data/TrailsRepository.java 2 additions, 0 deletionssrc/main/java/Team5/SmartTowns/data/TrailsRepository.java
- src/main/java/Team5/SmartTowns/data/TrailsRepositoryJDBC.java 5 additions, 0 deletions...main/java/Team5/SmartTowns/data/TrailsRepositoryJDBC.java
- src/main/java/Team5/SmartTowns/dragonstale/DragonsTale.java 19 additions, 0 deletionssrc/main/java/Team5/SmartTowns/dragonstale/DragonsTale.java
- src/main/java/Team5/SmartTowns/dragonstale/DragonsTaleController.java 60 additions, 0 deletions...a/Team5/SmartTowns/dragonstale/DragonsTaleController.java
- src/main/java/Team5/SmartTowns/dragonstale/DragonsTaleJDBC.java 30 additions, 0 deletions...in/java/Team5/SmartTowns/dragonstale/DragonsTaleJDBC.java
- src/main/java/Team5/SmartTowns/dragonstale/DragonsTaleRepository.java 4 additions, 0 deletions...a/Team5/SmartTowns/dragonstale/DragonsTaleRepository.java
- src/main/java/Team5/SmartTowns/landmarks/LandmarksController.java 48 additions, 6 deletions.../java/Team5/SmartTowns/landmarks/LandmarksController.java
- src/main/java/Team5/SmartTowns/placeswithcoordinates/LocationsCoordinates.java 18 additions, 4 deletions...martTowns/placeswithcoordinates/LocationsCoordinates.java
- src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesCoordinatesRepository.java 6 additions, 0 deletions...ns/placeswithcoordinates/PlacesCoordinatesRepository.java
- src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesCoordinatesRepositoryJDBC.java 40 additions, 3 deletions...laceswithcoordinates/PlacesCoordinatesRepositoryJDBC.java
- src/main/java/Team5/SmartTowns/towns/TownController.java 36 additions, 0 deletionssrc/main/java/Team5/SmartTowns/towns/TownController.java
Please register or sign in to comment