Commits · develop · Clelia Meneghin / ExplosivePomegranate

23 Dec, 2021 4 commits
- Merge branch 'last-fix' into 'develop' · 3d286f2b
  Salvatore Trupia authored Dec 23, 2021
```
fix return and style

See merge request !66
```
  3d286f2b
- fix return and style · 2c0cf6e7
  Clelia Meneghin authored Dec 23, 2021
  
  2c0cf6e7
- quickfix: when logged in as user the line underneath 'My Borrowed Books' is... · 599b4df0
  Salvatore Trupia authored Dec 23, 2021
```
quickfix: when logged in as user the line underneath 'My Borrowed Books' is now also hidden (in NavBar)
```
  599b4df0
- corrected placeholder name for text-input when adding comments to books · d7ba180c
  Salvatore Trupia authored Dec 23, 2021
  
  d7ba180c
22 Dec, 2021 1 commit
- Heroku button in README.md · ff6fae87
  Salvatore Trupia authored Dec 22, 2021
  
  ff6fae87
21 Dec, 2021 12 commits
- Update README.md · 06663234
  Salvatore Trupia authored Dec 21, 2021
  
  06663234
- deleted outdated .bsdesign files that have long been changed manually in HTML · 0dbfaefd
  Salvatore Trupia authored Dec 21, 2021
  
  0dbfaefd
- updated UseCase diagram · 6779d20a
  Salvatore Trupia authored Dec 21, 2021
  
  6779d20a
- Delete postmen-post.png · cdab4ab1
  Rebecca Beutling authored Dec 21, 2021
  
  cdab4ab1
- Delete postmen-get.png · cdf2c06a
  Rebecca Beutling authored Dec 21, 2021
  
  cdf2c06a
- Update README.md · 0e2c4406
  Rebecca Beutling authored Dec 21, 2021
  
  0e2c4406
- adjusted 1 sentence in Deployment section · 9e6e7cd1
  Salvatore Trupia authored Dec 21, 2021
  
  9e6e7cd1
- Merge branch 'read-me-update' into 'develop' · 505c86e6
  Clelia Meneghin authored Dec 21, 2021
```
Read me update

See merge request !65
```
  505c86e6
- Update README.md · 6d170a04
  Rebecca Beutling authored Dec 21, 2021
  
  6d170a04
- gantt chart · 3314f2b5
  Rebecca Beutling authored Dec 21, 2021
  
  3314f2b5
- Update README.md · e4d35485
  Rebecca Beutling authored Dec 21, 2021
  
  e4d35485
- Merge branch 'APIrequestDocumentation' into 'develop' · 4c3a19aa
  Rebecca Beutling authored Dec 21, 2021
```
Ap irequest documentation

See merge request !64
```
  4c3a19aa
20 Dec, 2021 23 commits
- Update README.md about limitation of 3600 queries per hour · 28e623cb
  Salvatore Trupia authored Dec 20, 2021
  
  28e623cb
- made agreeing to Terms for registration required · d6ad2b97
  Salvatore Trupia authored Dec 20, 2021
  
  d6ad2b97
- made tahat fat, ugly footer a bit smaller · 335088e3
  Salvatore Trupia authored Dec 20, 2021
  
  335088e3
- Merge branch 'develop' of gitlab.fhnw.ch:clelia.meneghin/explosivepomegranate... · 53458dcd
  Sonja Nussbaumer authored Dec 20, 2021
```
Merge branch 'develop' of gitlab.fhnw.ch:clelia.meneghin/explosivepomegranate into APIrequestDocumentation
```
  53458dcd
- Merge branch 'master' into 'develop' · 29055d1c
  Clelia Meneghin authored Dec 20, 2021
```
# Conflicts:
#   src/main/java/com/explosivepomegranate/rest/api/controller/BookController.java
#   src/main/java/com/explosivepomegranate/rest/api/model/Book.java
#   src/main/resources/static/login.html
#   src/main/resources/static/register.html
```
  29055d1c
- make links invisible · 3183bd86
  Clelia Meneghin authored Dec 20, 2021
  
  3183bd86
- Merge branch 'fixed_repeated_login_registration' into 'develop' · 3b126fe4
  Clelia Meneghin authored Dec 20, 2021
```
changes in Security config for JSESSIONID(repeated login problem) and...

See merge request !62
```
  3b126fe4
- Merge branch 'read-me-update' into 'develop' · 329fd159
  Sonja Nussbaumer authored Dec 20, 2021
```
new picture for read me

See merge request !61
```
  329fd159
- changes in Security config for JSESSIONID(repeated login problem) and... · 0b204938
  Salvatore Trupia authored Dec 20, 2021
```
changes in Security config for JSESSIONID(repeated login problem) and antMatchers(/myNewUser) -> functioning registration
```
  0b204938
- updated API request documentation · fd3e74c2
  Sonja Nussbaumer authored Dec 20, 2021
  
  fd3e74c2
- Update README.md · 0b33d6b1
  Rebecca Beutling authored Dec 20, 2021
  
  0b33d6b1
- Merge branch 'develop' of gitlab.fhnw.ch:clelia.meneghin/explosivepomegranate into develop · 892c79ad
  Clelia Meneghin authored Dec 20, 2021
  
  892c79ad
- update and fix style · 7f66cef5
  Clelia Meneghin authored Dec 20, 2021
  
  7f66cef5
- Merge branch 'develop' of gitlab.fhnw.ch:clelia.meneghin/explosivepomegranate... · 4aca0b35
  Sonja Nussbaumer authored Dec 20, 2021
```
Merge branch 'develop' of gitlab.fhnw.ch:clelia.meneghin/explosivepomegranate into APIrequestDocumentation
```
  4aca0b35
- updated API request documentation · 82788e68
  Sonja Nussbaumer authored Dec 20, 2021
  
  82788e68
- new picture for read me · 90dd8bf0
  Rebecca Beutling authored Dec 20, 2021
  
  90dd8bf0
- Update README.md · ad2e3f09
  Salvatore Trupia authored Dec 20, 2021
  
  ad2e3f09
- Merge branch 'develop' of gitlab.fhnw.ch:clelia.meneghin/explosivepomegranate into develop · 8b32f601
  Clelia Meneghin authored Dec 20, 2021
  
  8b32f601
- add comment to entry point · 25918c95
  Clelia Meneghin authored Dec 20, 2021
  
  25918c95
- Update README.md · d68fed63
  Rebecca Beutling authored Dec 20, 2021
  
  d68fed63
- Update README.md · 2c505836
  Rebecca Beutling authored Dec 20, 2021
  
  2c505836
- Update README.md · 2e789b83
  Rebecca Beutling authored Dec 20, 2021
  
  2e789b83
- Merge branch 'develop' of gitlab.fhnw.ch:clelia.meneghin/explosivepomegranate into develop · f11157c1
  Clelia Meneghin authored Dec 20, 2021
  
  f11157c1