Merge branch 'main' into...
Merge branch 'main' into 50-as-a-client-i-want-gamification-of-the-badges-so-that-users-remain-engaged # Conflicts: # src/main/resources/data.sql
No related branches found
No related tags found
Showing
- src/main/java/Team5/SmartTowns/Data/DatabaseController.java 2 additions, 2 deletionssrc/main/java/Team5/SmartTowns/Data/DatabaseController.java
- src/main/java/Team5/SmartTowns/Data/Location.java 48 additions, 0 deletionssrc/main/java/Team5/SmartTowns/Data/Location.java
- src/main/java/Team5/SmartTowns/Data/location.java 0 additions, 12 deletionssrc/main/java/Team5/SmartTowns/Data/location.java
- src/main/java/Team5/SmartTowns/Data/locationRepository.java 4 additions, 2 deletionssrc/main/java/Team5/SmartTowns/Data/locationRepository.java
- src/main/java/Team5/SmartTowns/Data/locationRepositoryJDBC.java 18 additions, 5 deletions...in/java/Team5/SmartTowns/Data/locationRepositoryJDBC.java
- src/main/java/Team5/SmartTowns/Landmarks/Landmarks.java 3 additions, 2 deletionssrc/main/java/Team5/SmartTowns/Landmarks/Landmarks.java
- src/main/java/Team5/SmartTowns/Landmarks/LandmarksController.java 10 additions, 6 deletions.../java/Team5/SmartTowns/Landmarks/LandmarksController.java
- src/main/resources/data.sql 26 additions, 0 deletionssrc/main/resources/data.sql
- src/main/resources/schema.sql 6 additions, 1 deletionsrc/main/resources/schema.sql
- src/main/resources/static/scripts/landmarkFormThScript.js 35 additions, 0 deletionssrc/main/resources/static/scripts/landmarkFormThScript.js
- src/main/resources/templates/Landmarks/LandmarkFormTh.html 6 additions, 39 deletionssrc/main/resources/templates/Landmarks/LandmarkFormTh.html
Loading
Please register or sign in to comment