- Dec 14, 2023
-
-
Gabriel Copat authored
Location apporval form validation update See merge request !44
-
Rhys Evans authored
-
Rhys Evans authored
-
Rhys Evans authored
-
Rhys Evans authored
-
Gabriel Copat authored
-
Gabriel Copat authored
-
Connor Brock authored
Merge branch '74-as-a-user-i-want-to-see-a-page-of-local-authorities-so-that-i-can-easily-source-contact-details' into 'main' Resolve "As a user, I want to see a page of local authorities so that I can easily source contact details for a variety of different local authorities." Closes #74 See merge request !31
-
Gabriel Copat authored
-
Rhys Evans authored
-
Gabriel Copat authored
Merge remote-tracking branch 'origin/74-as-a-user-i-want-to-see-a-page-of-local-authorities-so-that-i-can-easily-source-contact-details' into 74-as-a-user-i-want-to-see-a-page-of-local-authorities-so-that-i-can-easily-source-contact-details
-
Gabriel Copat authored
-
Rhys Evans authored
-
Rhys Nute authored
-
Gabriel Copat authored
-
Gabriel Copat authored
-
Gabriel Copat authored
Merge branch 'businesses' into 74-as-a-user-i-want-to-see-a-page-of-local-authorities-so-that-i-can-easily-source-contact-details # Conflicts: # src/main/java/Team5/SmartTowns/Organisation/organisationControllers.java # src/main/resources/data.sql # src/main/resources/schema.sql # src/main/resources/templates/fragments/Templating.html # src/main/resources/templates/local-authorities.html # src/test/java/Team5/SmartTownsOld/DataSourceConfig.java
-
Gabriel Copat authored
-
Gabriel Copat authored
-
Gabriel Copat authored
-
Gabriel Copat authored
-
Gabriel Copat authored
Merge branch '77-as-a-user-i-want-to-be-able-to-use-the-application-on-any-device-e-g-iphone-ipad-laptop' into 'main' Resolve "As a user I want to be able to use the application on any device e.g. iPhone, iPad, Laptop" Closes #77 See merge request !36
-
Rhys Nute authored
-
Gabriel Copat authored
-
Gabriel Copat authored
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
-
Rhys Nute authored
-
Rhys Nute authored
-
Connor Brock authored
Merge branch '69-as-a-user-i-would-like-a-town-specific-page-which-shows-all-trails-for-that-town-so-that-i-can' into 'main' Resolve "As a user, I would like a town specific page which shows all trails for that town so that I can easily see my progress" Closes #69 See merge request !34
-
Rhys Evans authored
-
Rhys Evans authored
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" "Merging with main"
-
Rhys Evans authored
-
Rhys Evans authored
-
Rhys Evans authored
Merge branch '80-as-a-convenience-enthusiast-i-want-a-drop-down-menu-to-be-able-to-quickly-scan-qr-codes-i-find' into 'main' Resolve "As a convenience enthusiast, I want a drop down menu to be able to quickly scan QR codes I find along my dragon trail so that I may continue on my adventure without disruption." Closes #80 See merge request !41
-
Connor Brock authored
-
Connor Brock authored
Merge remote-tracking branch 'origin/main' into 80-as-a-convenience-enthusiast-i-want-a-drop-down-menu-to-be-able-to-quickly-scan-qr-codes-i-find
-
Rhys Evans authored
-
Rhys Evans authored
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
-
Rhys Evans authored
-
Connor Brock authored
Merge branch '82-as-a-site-admininstrator-i-want-to-be-able-to-review-submited-trail-checkpoints-by-bussiness' into 'main' Resolve "As a site administrator I want to be able to review submitted trail checkpoints by business owners, so that they might be added to the existing trails Closes #82 See merge request !42
-
Rhys Evans authored
-