Merge branch 'release/Sprint-4' into '256-language-options-so-that-i-can-switch-to-polish' (a4e0c78f) · Commits · Beth Davies / polish-community-beth

Commit a4e0c78f authored 4 months ago by Richard Githuba

Merge branch 'release/Sprint-4' into '256-language-options-so-that-i-can-switch-to-polish'

# Conflicts:
#   src/main/java/polish_community_group_11/polish_community/security/WebSecurityConfig.java
#   src/main/resources/schema.sql

parents 5fe5a627 410b3d4e

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

build.gradle 0 additions, 1 deletion

build.gradle
src/main/java/polish_community_group_11/polish_community/event/controllers/EventController.java 82 additions, 4 deletions

...1/polish_community/event/controllers/EventController.java
src/main/java/polish_community_group_11/polish_community/event/dao/EventRepository.java 15 additions, 0 deletions

..._group_11/polish_community/event/dao/EventRepository.java
src/main/java/polish_community_group_11/polish_community/event/dao/EventRepositoryImpl.java 65 additions, 2 deletions

...up_11/polish_community/event/dao/EventRepositoryImpl.java
src/main/java/polish_community_group_11/polish_community/event/models/Event.java 3 additions, 0 deletions

...mmunity_group_11/polish_community/event/models/Event.java
src/main/java/polish_community_group_11/polish_community/event/models/EventImpl.java 14 additions, 0 deletions

...ity_group_11/polish_community/event/models/EventImpl.java
src/main/java/polish_community_group_11/polish_community/event/models/viewmodel/EventForm.java 62 additions, 0 deletions

...11/polish_community/event/models/viewmodel/EventForm.java
src/main/java/polish_community_group_11/polish_community/event/services/EventService.java 13 additions, 0 deletions

...roup_11/polish_community/event/services/EventService.java
src/main/java/polish_community_group_11/polish_community/event/services/EventServiceImpl.java 38 additions, 0 deletions

..._11/polish_community/event/services/EventServiceImpl.java
src/main/java/polish_community_group_11/polish_community/profile/controllers/ProfileController.java 81 additions, 0 deletions

...lish_community/profile/controllers/ProfileController.java
src/main/java/polish_community_group_11/polish_community/profile/controllers/ProfileRestController.java 30 additions, 0 deletions

..._community/profile/controllers/ProfileRestController.java
src/main/java/polish_community_group_11/polish_community/profile/models/Profile.java 23 additions, 0 deletions

...ity_group_11/polish_community/profile/models/Profile.java
src/main/java/polish_community_group_11/polish_community/profile/repositories/ProfileRepository.java 13 additions, 0 deletions

...ish_community/profile/repositories/ProfileRepository.java
src/main/java/polish_community_group_11/polish_community/profile/repositories/ProfileRepositoryImpl.java 52 additions, 0 deletions

...community/profile/repositories/ProfileRepositoryImpl.java
src/main/java/polish_community_group_11/polish_community/profile/services/ProfileService.java 22 additions, 0 deletions

..._11/polish_community/profile/services/ProfileService.java
src/main/java/polish_community_group_11/polish_community/register/controllers/RegisterController.java 9 additions, 0 deletions

...sh_community/register/controllers/RegisterController.java
src/main/java/polish_community_group_11/polish_community/register/dao/UserRepository.java 2 additions, 0 deletions

...roup_11/polish_community/register/dao/UserRepository.java
src/main/java/polish_community_group_11/polish_community/register/dao/UserRepositoryImpl.java 17 additions, 1 deletion

..._11/polish_community/register/dao/UserRepositoryImpl.java
src/main/java/polish_community_group_11/polish_community/register/services/UserService.java 2 additions, 0 deletions

...up_11/polish_community/register/services/UserService.java
src/main/java/polish_community_group_11/polish_community/register/services/UserServiceImpl.java 6 additions, 0 deletions

...1/polish_community/register/services/UserServiceImpl.java

with 549 additions and 8 deletions

Please register or to comment