There was an error fetching the commit references. Please try again later.
Merge branch...
Merge branch '46-as-a-child-i-want-an-interesting-and-exciting-story-based-trail-with-obvious-landmarks-so-i-can' into 'main' Resolve "As a child, I want an interesting and exciting story based trail with obvious landmarks, so I can follow the trail with ease." Closes #46 See merge request !18
No related branches found
No related tags found
Showing
- src/main/java/Team5/SmartTowns/Landmarks/Landmarks.java 24 additions, 9 deletionssrc/main/java/Team5/SmartTowns/Landmarks/Landmarks.java
- src/main/java/Team5/SmartTowns/Landmarks/LandmarksController.java 1 addition, 1 deletion.../java/Team5/SmartTowns/Landmarks/LandmarksController.java
- src/main/java/Team5/SmartTowns/trailcontrollers/DragonsTale.java 0 additions, 15 deletions...n/java/Team5/SmartTowns/trailcontrollers/DragonsTale.java
- src/main/java/Team5/SmartTowns/trails/Trail.java 1 addition, 1 deletionsrc/main/java/Team5/SmartTowns/trails/Trail.java
- src/main/java/Team5/SmartTowns/trails/TrailsController.java 13 additions, 1 deletionsrc/main/java/Team5/SmartTowns/trails/TrailsController.java
- src/main/resources/static/css/dragonstaless.css 9 additions, 1 deletionsrc/main/resources/static/css/dragonstaless.css
- src/main/resources/static/images/trails/dragonone.png 0 additions, 0 deletionssrc/main/resources/static/images/trails/dragonone.png
- src/main/resources/static/images/trails/dragonstalehome.png 0 additions, 0 deletionssrc/main/resources/static/images/trails/dragonstalehome.png
- src/main/resources/templates/fragments/landmarkFrag.html 8 additions, 0 deletionssrc/main/resources/templates/fragments/landmarkFrag.html
- src/main/resources/templates/fragments/landmarkInfoFrag.html 13 additions, 0 deletionssrc/main/resources/templates/fragments/landmarkInfoFrag.html
- src/main/resources/templates/towns/trails/dragonstale/index.html 41 additions, 23 deletions...n/resources/templates/towns/trails/dragonstale/index.html
- src/main/resources/templates/towns/trails/dragonstale/script.js 0 additions, 8 deletions...in/resources/templates/towns/trails/dragonstale/script.js
- src/main/resources/templates/towns/trails/dragonstale/trailcheckpoints/one/one.html 0 additions, 37 deletions...es/towns/trails/dragonstale/trailcheckpoints/one/one.html
Loading
Please register or sign in to comment