|
|
|
@30ab9cc
|
17 months |
noreply |
Merge pull request #12 from SazdovaEkaterina/use-project-schema
…
main
|
|
|
@c049fd6
|
17 months |
sazdovaekaterina |
specify project schema in the backend
main
|
|
|
@e4e8212
|
21 months |
noreply |
Update README.md
main
|
|
|
@656be6e
|
21 months |
noreply |
Update README.md
main
|
|
|
@4ab3aae
|
21 months |
noreply |
Merge pull request #10 from SazdovaEkaterina/approve-adopter
Approve …
main
|
|
|
@7aa3382
|
21 months |
sazdovaekaterina |
add approve functionality
main
|
|
|
@56a6233
|
21 months |
sazdovaekaterina |
fix problems with model -> template + change naming
main
|
|
|
@104185f
|
21 months |
sazdovaekaterina |
Update AdopterServiceImplementation.java
main
|
|
|
@0078d84
|
21 months |
sazdovaekaterina |
resolve merge conflicts
main
|
|
|
@b46d1f2
|
21 months |
86695898+FilipChorbeski |
Changes needed for merge
main
|
|
|
@c3278ac
|
21 months |
noreply |
Merge pull request #9 from SazdovaEkaterina/fix-foreign-keys
Fix …
main
|
|
|
@264d675
|
21 months |
sazdovaekaterina |
add missing brackets
main
|
|
|
@95dd50a
|
21 months |
sazdovaekaterina |
resolve comment
main
|
|
|
@5dea0b7
|
21 months |
sazdovaekaterina |
1-1 rel
main
|
|
|
@e76c5a6
|
21 months |
sazdovaekaterina |
fix usages that got broken with the changes
main
|
|
|
@c03e53b
|
21 months |
sazdovaekaterina |
m-m relations
main
|
|
|
@d1fe9c2
|
21 months |
sazdovaekaterina |
required args constructor
main
|
|
|
@fdd7961
|
21 months |
sazdovaekaterina |
fix many to one relations
main
|
|
|
@8b7dd7f
|
21 months |
noreply |
Merge pull request #8 from SazdovaEkaterina/adopting-a-pet
Adopting a Pet
main
|
|
|
@5f53114
|
21 months |
sazdovaekaterina |
use model instead of session
main
|
|
|
@9358bff
|
21 months |
sazdovaekaterina |
fix button layout and appereance
main
|
|
|
@cadbec3
|
21 months |
sazdovaekaterina |
show adoption option only if not adopted yet
main
|
|
|
@33b9f30
|
21 months |
sazdovaekaterina |
fix duplicate id
main
|
|
|
@eac569a
|
21 months |
sazdovaekaterina |
merge main into adopting-a-pet
main
|
|
|
@f194b4e
|
21 months |
noreply |
Merge pull request #7 from SazdovaEkaterina/create-post
Create Post
main
|
|
|
@4103eaa
|
21 months |
sazdovaekaterina |
create post for existing pet + disable form if selecting from list
main
|
|
|
@8f1a362
|
21 months |
86695898+FilipChorbeski |
fix typo
main
|
|
|
@3e59177
|
21 months |
sazdovaekaterina |
session has user attribute, not employee
main
|
|
|
@b00d81b
|
21 months |
sazdovaekaterina |
home redirects to login if not logged in
main
|
|
|
@d7eaf88
|
21 months |
sazdovaekaterina |
fix thymeleaf links
This was the problem that was causing model …
main
|
|
|
@996b8ba
|
21 months |
118018439+trajchevaM |
commit on new and updated functionalities
main
|
|
|
@7e3f2f7
|
21 months |
86695898+FilipChorbeski |
(temp) added listpets and Employee session request
(temp) added …
main
|
|
|
@245f0ec
|
21 months |
118018439+trajchevaM |
Home Controller
main
|
|
|
@6941fac
|
21 months |
sazdovaekaterina |
link to home and added headers
main
|
|
|
@9ee306b
|
21 months |
sazdovaekaterina |
Merge branch 'main' into create-post
main
|
|
|
@3c7bf5b
|
21 months |
sazdovaekaterina |
link to home and add headers
main
|
|
|
@9a180fd
|
21 months |
sazdovaekaterina |
adopt a pet button + save adoption to db
main
|
|
|
@50f2c2a
|
21 months |
sazdovaekaterina |
merge changes from main & resolve conflicts
main
|
|
|
@eef07ff
|
21 months |
noreply |
Merge pull request #6 from SazdovaEkaterina/login-and-register
Login …
main
|
|
|
@aced08c
|
21 months |
118018439+trajchevaM |
Updated RegisterController and Adopter
Changed primitive types of Adopter
main
|
|
|
@dad5bcd
|
21 months |
118018439+trajchevaM |
Renamed services implementations
main
|
|
|
@59a8941
|
21 months |
sazdovaekaterina |
merge login and register into branch
main
|
|
|
@da44aef
|
21 months |
118018439+trajchevaM |
register functionality
1. Changed css of login.html
2. Changed css …
main
|
|
|
@a762b3a
|
21 months |
sazdovaekaterina |
adoption posts list + pet details page
main
|
|
|
@3f5e485
|
21 months |
sazdovaekaterina |
merge create-post and login branches
resolved merge conflicts
main
|
|
|
@04e4f54
|
21 months |
sazdovaekaterina |
canBeFostered param default false when unchecked
main
|
|
|
@c37c953
|
21 months |
sazdovaekaterina |
redirect to home
+added comment for todo
main
|
|
|
@325a55d
|
21 months |
sazdovaekaterina |
Merge branch 'login-and-register' into create-post
main
|
|
|
@f0232fb
|
21 months |
118018439+trajchevaM |
login and home
main
|
|
|
@468b7b6
|
21 months |
86695898+FilipChorbeski |
create post form (initial version)
successfully communicates with …
main
|
|
|
@988f3fa
|
22 months |
86695898+FilipChorbeski |
pet service uses pet repo
Co-Authored-By: SazdovaEkaterina …
main
|
|
|
@a2060cb
|
22 months |
86695898+FilipChorbeski |
remove duplicate import
Co-Authored-By: SazdovaEkaterina …
main
|
|
|
@8a0b460
|
22 months |
86695898+FilipChorbeski |
add post service, add post controller, pet service uses pet repo
…
main
|
|
|
@023f79c
|
22 months |
86695898+FilipChorbeski |
fix indentation
main
|
|
|
@55c0119
|
22 months |
86695898+FilipChorbeski |
add pet service & controller
Co-Authored-By: SazdovaEkaterina …
main
|
|
|
@6479fe1
|
22 months |
86695898+FilipChorbeski |
fix errors
Co-Authored-By: SazdovaEkaterina …
main
|
|
|
@738b31a
|
22 months |
86695898+FilipChorbeski |
resolve merge conflict
main
|
|
|
@486054e
|
22 months |
86695898+FilipChorbeski |
resolve merge conflict
Co-Authored-By: SazdovaEkaterina …
main
|
|
|
@4d78603
|
22 months |
86695898+FilipChorbeski |
resolve merge conflict from main
Co-Authored-By: SazdovaEkaterina …
main
|
|
|
@b1b571b
|
22 months |
86695898+FilipChorbeski |
Merge branch 'main' into create-post
main
|
|
|
@65f9c71
|
22 months |
noreply |
Merge pull request #5 from SazdovaEkaterina/create-repositories
…
main
|
|
|
@af3f18f
|
22 months |
86695898+FilipChorbeski |
create jpa repositories
Co-Authored-By: SazdovaEkaterina …
main
|
|
|
@d396372
|
22 months |
86695898+FilipChorbeski |
Merge branch 'main' into create-post
main
|
|
|
@e294983
|
22 months |
86695898+FilipChorbeski |
Merge branch 'main' into adopting-a-pet
main
|
|
|
@d546868
|
22 months |
noreply |
Merge pull request #3 from SazdovaEkaterina/create-models
Create …
main
|
|
|
@ada7108
|
22 months |
86695898+FilipChorbeski |
change ids from int to Integer
Co-Authored-By: SazdovaEkaterina …
main
|
|
|
@4846b7a
|
22 months |
sazdovaekaterina |
fix composite keys
main
|
|
|
@29c4253
|
22 months |
sazdovaekaterina |
Delete .gitkeep
main
|
|
|
@3d3e59d
|
22 months |
sazdovaekaterina |
move entity models to separate folder
main
|
|
|
@038c9f7
|
22 months |
sazdovaekaterina |
add @GeneratedValue to ids
main
|
|
|
@1bd0a56
|
22 months |
sazdovaekaterina |
Merge branch 'create-models' into create-post
main
|
|
|
@8ae6217
|
22 months |
sazdovaekaterina |
Merge branch 'create-models' into adopting-a-pet
main
|
|
|
@579bf6d
|
22 months |
sazdovaekaterina |
added inheritance
main
|
|
|
@4885da3
|
22 months |
sazdovaekaterina |
create blank repo service templates controllers
main
|
|
|
@a3aea2a
|
22 months |
sazdovaekaterina |
Merge branch 'create-models' into create-post
main
|
|
|
@fdfc6fa
|
22 months |
sazdovaekaterina |
change to LocalDate
Date (Java) was incompatible with date …
main
|
|
|
@6a17c29
|
22 months |
86695898+FilipChorbeski |
Merge remote-tracking branch 'origin/create-models' into create-post
main
|
|
|
@6f9c38f
|
22 months |
sazdovaekaterina |
change hibernate ddl auto setting
main
|
|
|
@cfc3e81
|
22 months |
86695898+FilipChorbeski |
Created html and controller for post
main
|
|
|
@e1642f4
|
22 months |
sazdovaekaterina |
resolve comment
main
|
|
|
@2fdea25
|
22 months |
sazdovaekaterina |
resolve comment
main
|
|
|
@94308ea
|
22 months |
sazdovaekaterina |
resolved comment
main
|
|
|
@d427a07
|
22 months |
sazdovaekaterina |
add models and enums
main
|
|
|
@f39eecf
|
23 months |
noreply |
Merge pull request #2 from SazdovaEkaterina/create-folder-structure
…
main
|
|
|
@364faf0
|
23 months |
sazdovaekaterina |
add .gitkeep so folders will be added
main
|
|
|
@477c13f
|
23 months |
noreply |
Delete tunnel_scripta.cmd
main
|
|
|
@b3cbeae
|
23 months |
noreply |
Merge pull request #1 from SazdovaEkaterina/create-spring-boot-project …
main
|
|
|
@dd17343
|
23 months |
sazdovaekaterina |
add tunnel script
main
|
|
|
@c482a3d
|
23 months |
sazdovaekaterina |
database setup
main
|
|
|
@4cc22f9
|
23 months |
sazdovaekaterina |
create project
main
|
|
|
@493b2dd
|
23 months |
sazdovaekaterina |
Create .gitkeep
main
|
|
|
@e2d20ed
|
2 years |
sazdovaekaterina |
add new line
main
|
|
|
@6747c86
|
2 years |
sazdovaekaterina |
add project description in readme
main
|
|
|
@98b48bf
|
2 years |
noreply |
Initial commit
main
|