Commits · develop · Clelia Meneghin / ExplosivePomegranate

03 Dec, 2021 3 commits
- Merge branch 'separate-html' into 'develop' · fd2414cc
  Salvatore Trupia authored Dec 03, 2021
```
split html, add new navigation item, hideElement if not Admin

See merge request !35
```
  fd2414cc
- split html, add new navigation item, hideElement if not Admin · 5a9fa916
  Clelia Meneghin authored Dec 03, 2021
  
  5a9fa916
- Merge branch 'init-load-Books' into 'develop' · e719bc05
  Salvatore Trupia authored Dec 03, 2021
```
load books from db and logout

See merge request !34
```
  e719bc05
02 Dec, 2021 1 commit
- load books from db and logout · 322e1f7e
  Clelia Meneghin authored Dec 02, 2021
  
  322e1f7e
30 Nov, 2021 1 commit
- Merge branch 'quickfix_UC5' into 'develop' · b5ead064
  Clelia Meneghin authored Nov 30, 2021
```
quickfix_UC5

See merge request !33
```
  b5ead064
29 Nov, 2021 8 commits
- ONLY took an afternoon.. · 91a12097
  SalvoTr authored Nov 29, 2021
  
  91a12097
- Merge branch 'Service-addition' into 'develop' · 998ea97b
  Salvatore Trupia authored Nov 29, 2021
```
Service addition

See merge request !32
```
  998ea97b
- add merge split content · b4f37560
  Clelia Meneghin authored Nov 29, 2021
  
  b4f37560
- Merge branch 'develop' of gitlab.fhnw.ch:clelia.meneghin/explosivepomegranate into Service-addition · 13dc7a45
  Clelia Meneghin authored Nov 29, 2021
  
  13dc7a45
- Update README.md - removed /BooksReleasesIn · 74c5aa42
  Salvatore Trupia authored Nov 29, 2021
  
  74c5aa42
- add service class · dcffedac
  Clelia Meneghin authored Nov 29, 2021
  
  dcffedac
- Merge branch 'Last_3_UC5_Requests' into 'develop' · 7f108789
  Clelia Meneghin authored Nov 29, 2021
```
Last 3 uc5 requests

See merge request !31
```
  7f108789
- minimal changes - looping problem not solved · 9dff0177
  SalvoTr authored Nov 29, 2021
  
  9dff0177
26 Nov, 2021 5 commits
- comment · 58c61783
  Salvatore Trupia authored Nov 26, 2021
  
  58c61783
- started work on remaining UC5 requests · d8149137
  Salvatore Trupia authored Nov 26, 2021
  
  d8149137
- Merge branch 'Borrowed_(UC11)' into 'develop' · 61b93b80
  Clelia Meneghin authored Nov 26, 2021
```
Borrowed (uc11)

See merge request !30
```
  61b93b80
- added comment · 0245a7b8
  Salvatore Trupia authored Nov 26, 2021
  
  0245a7b8
- fixed Borrowed class · 3df21a01
  Salvatore Trupia authored Nov 26, 2021
  
  3df21a01
25 Nov, 2021 1 commit
- Merge branch 'cookie' into 'develop' · 6c23fafe
  Salvatore Trupia authored Nov 25, 2021
```
Cookie: add remember me cookie

See merge request !29
```
  6c23fafe
22 Nov, 2021 7 commits
- add remember me cookie · d775550c
  Clelia Meneghin authored Nov 22, 2021
  
  d775550c
- Merge branch 'uc6_BookInfo' into 'develop' · 2715faa3
  Salvatore Trupia authored Nov 22, 2021
```
Uc6 book info

See merge request !28
```
  2715faa3
- corrections in user and book · 41922d04
  Sonja Nussbaumer authored Nov 22, 2021
  
  41922d04
- many to one user and book · 4f629176
  Sonja Nussbaumer authored Nov 22, 2021
  
  4f629176
- Merge branch 'implement-roles' into 'develop' · bd46263a
  Sonja Nussbaumer authored Nov 22, 2021
```
add comments

See merge request !27
```
  bd46263a
- add comments · 70bdab28
  Clelia Meneghin authored Nov 22, 2021
  
  70bdab28
- Merge branch 'implement-roles' into 'develop' · c3274ba8
  Sonja Nussbaumer authored Nov 22, 2021
```
enable Secured methods

See merge request !26
```
  c3274ba8
20 Nov, 2021 2 commits
- update method desc · feedcd13
  Clelia Meneghin authored Nov 20, 2021
  
  feedcd13
- update bookId method and enable secured · 6d5b746f
  Clelia Meneghin authored Nov 20, 2021
  
  6d5b746f
19 Nov, 2021 3 commits
- Merge branch 'UC5_Salvatore' into 'develop' · 860b4916
  Clelia Meneghin authored Nov 19, 2021
```
UC5 merge

See merge request !24
```
  860b4916
- Merge branch 'develop' into 'UC5_Salvatore' · 5e0234aa
  Salvatore Trupia authored Nov 19, 2021
```
# Conflicts:
#   src/main/java/com/explosivepomegranate/rest/api/controller/BookController.java
#   src/main/java/com/explosivepomegranate/rest/api/model/Book.java
```
  5e0234aa
- Merge branch 'role-model' into 'develop' · 7a6d73c3
  Salvatore Trupia authored Nov 19, 2021
```
implement login

See merge request !23
```
  7a6d73c3
15 Nov, 2021 6 commits
- Merge branch 'develop' of gitlab.fhnw.ch:clelia.meneghin/explosivepomegranate into role-model · 8d1c216b
  Clelia Meneghin authored Nov 15, 2021
  
  8d1c216b
- fix login · c1ec74ee
  Clelia Meneghin authored Nov 15, 2021
  
  c1ec74ee
- Life is pain. · 75aec29c
  SalvoTr authored Nov 15, 2021
  
  75aec29c
- Merge branch 'uc6_BookInfo' into 'develop' · b31f5274
  Clelia Meneghin authored Nov 15, 2021
```
added UC6 find book information by id

See merge request !22
```
  b31f5274
- work in progress, not mergable yet · d8bef4dc
  Clelia Meneghin authored Nov 15, 2021
  
  d8bef4dc
- added UC6 find book information by id · 408218c0
  Sonja Nussbaumer authored Nov 15, 2021
  
  408218c0
14 Nov, 2021 1 commit
- upload for remote work · 56c65fd7
  Salvatore Trupia authored Nov 14, 2021
  
  56c65fd7
10 Nov, 2021 1 commit
- Resolved @ManyToMany & prepared Author and Category (Entity + Repository) · 6a47a628
  Salvatore Trupia authored Nov 10, 2021
  
  6a47a628
09 Nov, 2021 1 commit
- Started with Category · 4fc2178b
  Salvatore Trupia authored Nov 09, 2021
```
Still have to resolve @ManyToMany
Then do it for Author
```
  4fc2178b