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/Towns/TownController.java 21 additions, 0 deletionssrc/main/java/Team5/SmartTowns/Towns/TownController.java
- src/main/java/Team5/SmartTowns/Towns/TownStorage.java 44 additions, 0 deletionssrc/main/java/Team5/SmartTowns/Towns/TownStorage.java
- src/main/java/Team5/SmartTowns/Towns/Towns.java 62 additions, 0 deletionssrc/main/java/Team5/SmartTowns/Towns/Towns.java
- src/main/java/Team5/SmartTowns/Webpages/WebpageController.java 9 additions, 8 deletions...ain/java/Team5/SmartTowns/Webpages/WebpageController.java
- src/main/resources/data.sql 23 additions, 23 deletionssrc/main/resources/data.sql
- src/main/resources/static/css/homePageStyle.css 109 additions, 61 deletionssrc/main/resources/static/css/homePageStyle.css
- src/main/resources/templates/Landmarks/LandmarkFormTh.html 0 additions, 2 deletionssrc/main/resources/templates/Landmarks/LandmarkFormTh.html
- src/main/resources/templates/towns/home/homePage.html 27 additions, 31 deletionssrc/main/resources/templates/towns/home/homePage.html
- src/main/resources/templates/towns/home/homePageOld.html 66 additions, 0 deletionssrc/main/resources/templates/towns/home/homePageOld.html
Loading
Please register or sign in to comment