# Conflicts:
#	build.gradle
#	src/main/java/com/example/clientproject/config/SecurityConfig.java
#	src/main/java/com/example/clientproject/data/users/Users.java
#	src/main/java/com/example/clientproject/web/controllers/HomeController.java
#	src/main/java/com/example/clientproject/web/controllers/SignInController.java
#	src/main/resources/database/Data Script/script.sql
#	src/main/resources/templates/fragments/nav.html

Alteration of how erroneous sign-ins work, now redirects to a "403" error page which can be used generally for all "403 FORBIDDEN" errors

All Acceptance Criteria Met, password fields on "script.sql" and "script-test-h2.sql" changed to use new BCrypt method of hashing

# Conflicts:
#   src/main/resources/database/Data Script/script.sql
#   src/main/resources/database/Data Script/tablePopulator.py

Finished issueThree

See merge request !18

Removal of "AUTO_INCREMENT" on AdminTypes id field since there will only ever...

See merge request !17

# Conflicts:
#	src/main/java/com/example/clientproject/config/SecurityConfig.java

Ethan Allen-Harris authored 3 years ago and Ethan Allen-Harris committed 3 years ago

Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>

Develop

See merge request !16

Issue three

See merge request !15

Added partial saving, new shop is created but info needs to be saved e.g....

See merge request !14

Added partial saving, new shop is created but info needs to be saved e.g. description, with no field to save it too

Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>

Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>

# Conflicts:
#	src/main/resources/static/css/nav.css

Signed-off-by: c2064724 <allen-harrise@cardiff.ac.uk>

Adding finished JPA and database to remove blockers

See merge request !12

# Conflicts:
#   src/main/resources/application.properties

Issue 1 Complete, merging into Develop

See merge request !11