Merge branch 'main' into...
Merge branch 'main' into 69-as-a-user-i-would-like-a-town-specific-page-which-shows-all-trails-for-that-town-so-that-i-can # Conflicts: # src/test/java/Team5/SmartTownsOld/placeswithcoordinates/PlacesCoordinatesTest.java
No related branches found
No related tags found
Showing
- 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/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/PlacesController.java 47 additions, 6 deletions...m5/SmartTowns/placeswithcoordinates/PlacesController.java
- src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesCoordinatesRepository.java 4 additions, 0 deletions...ns/placeswithcoordinates/PlacesCoordinatesRepository.java
- src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesCoordinatesRepositoryJDBC.java 38 additions, 3 deletions...laceswithcoordinates/PlacesCoordinatesRepositoryJDBC.java
- src/main/java/Team5/SmartTowns/security/SecurityConfiguration.java 2 additions, 0 deletions...java/Team5/SmartTowns/security/SecurityConfiguration.java
- src/main/resources/static/css/homePageStyle.css 5 additions, 1 deletionsrc/main/resources/static/css/homePageStyle.css
- src/main/resources/static/css/locationApprovalFormStyle.css 26 additions, 0 deletionssrc/main/resources/static/css/locationApprovalFormStyle.css
- src/main/resources/static/scripts/locationApprovalForm.js 16 additions, 0 deletionssrc/main/resources/static/scripts/locationApprovalForm.js
- src/main/resources/templates/landmarks/locationApprovalFormTh.html 72 additions, 0 deletions...resources/templates/landmarks/locationApprovalFormTh.html
- src/main/resources/templates/landmarks/trailsPage.html 8 additions, 0 deletionssrc/main/resources/templates/landmarks/trailsPage.html
- src/main/resources/templates/towns/home/homePage.html 1 addition, 0 deletionssrc/main/resources/templates/towns/home/homePage.html
- src/test/java/Team5/SmartTownsOld/LocationRepositoryTest.java 21 additions, 11 deletions...test/java/Team5/SmartTownsOld/LocationRepositoryTest.java
- src/test/java/Team5/SmartTownsOld/placeswithcoordinates/PlacesCoordinatesTest.java 44 additions, 3 deletions...TownsOld/placeswithcoordinates/PlacesCoordinatesTest.java
- src/test/java/Team5/SmartTownsOld/testUsers.java 2 additions, 2 deletionssrc/test/java/Team5/SmartTownsOld/testUsers.java
Loading
Please register or sign in to comment