Merge branch 'businesses' into...
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
No related branches found
No related tags found
Showing
- src/main/java/Team5/SmartTowns/Organisation/organisationControllers.java 34 additions, 27 deletions...eam5/SmartTowns/Organisation/organisationControllers.java
- src/main/java/Team5/SmartTowns/business/business.java 59 additions, 0 deletionssrc/main/java/Team5/SmartTowns/business/business.java
- src/main/java/Team5/SmartTowns/business/businessRepository.java 8 additions, 0 deletions...in/java/Team5/SmartTowns/business/businessRepository.java
- src/main/java/Team5/SmartTowns/business/businessRepositoryJDBC.java 41 additions, 0 deletions...ava/Team5/SmartTowns/business/businessRepositoryJDBC.java
- src/main/resources/static/css/businessesStyle.css 13 additions, 0 deletionssrc/main/resources/static/css/businessesStyle.css
- src/main/resources/templates/WorkWith/local-authorities.html 21 additions, 0 deletionssrc/main/resources/templates/WorkWith/local-authorities.html
- src/main/resources/templates/business-data.html 41 additions, 0 deletionssrc/main/resources/templates/business-data.html
- src/main/resources/templates/businesses.html 23 additions, 0 deletionssrc/main/resources/templates/businesses.html
- src/main/resources/templates/fragments/Templating.html 7 additions, 16 deletionssrc/main/resources/templates/fragments/Templating.html
Loading
Please register or sign in to comment