Merge branch 'release/Sprint-4' into...
Merge branch 'release/Sprint-4' into '122-as-an-admin-i-want-to-be-able-to-edit-my-post-so-that-i-can-edit-any-wrong-information-and-keep' # Conflicts: # src/main/java/polish_community_group_11/polish_community/security/WebSecurityConfig.java
Showing
- build.gradle 1 addition, 2 deletionsbuild.gradle
- src/main/java/polish_community_group_11/polish_community/security/WebSecurityConfig.java 5 additions, 18 deletions...group_11/polish_community/security/WebSecurityConfig.java
- src/main/resources/static/css/home/home.css 1 addition, 1 deletionsrc/main/resources/static/css/home/home.css
- src/main/resources/static/css/layout/layout.css 36 additions, 1 deletionsrc/main/resources/static/css/layout/layout.css
- src/main/resources/static/css/login/login.css 24 additions, 9 deletionssrc/main/resources/static/css/login/login.css
- src/main/resources/static/js/layout/accountDropdown.js 18 additions, 0 deletionssrc/main/resources/static/js/layout/accountDropdown.js
- src/main/resources/templates/home/home.html 1 addition, 1 deletionsrc/main/resources/templates/home/home.html
- src/main/resources/templates/layout/layout.html 26 additions, 9 deletionssrc/main/resources/templates/layout/layout.html
Loading
Please register or sign in to comment