Merge remote-tracking branch 'origin/main' into add_Error_status_codes
# Conflicts: # src/main/java/hdm/mi/growbros/controllers/GardenController.java # src/main/java/hdm/mi/growbros/controllers/GrandmaController.java # src/main/java/hdm/mi/growbros/controllers/WishListController.java
No related branches found
No related tags found
Showing
- .gitlab-ci.yml 22 additions, 0 deletions.gitlab-ci.yml
- CHANGELOG.md 21 additions, 11 deletionsCHANGELOG.md
- growbros-frontend/package-lock.json 854 additions, 18 deletionsgrowbros-frontend/package-lock.json
- growbros-frontend/package.json 4 additions, 0 deletionsgrowbros-frontend/package.json
- growbros-frontend/src/components/DropDownFilter.tsx 25 additions, 30 deletionsgrowbros-frontend/src/components/DropDownFilter.tsx
- growbros-frontend/src/components/FilterPage.tsx 75 additions, 20 deletionsgrowbros-frontend/src/components/FilterPage.tsx
- growbros-frontend/src/components/PlantDetails.tsx 41 additions, 46 deletionsgrowbros-frontend/src/components/PlantDetails.tsx
- growbros-frontend/src/components/StatusMessage.tsx 30 additions, 0 deletionsgrowbros-frontend/src/components/StatusMessage.tsx
- growbros-frontend/src/pages/Garten.tsx 70 additions, 31 deletionsgrowbros-frontend/src/pages/Garten.tsx
- growbros-frontend/src/pages/Suche.tsx 129 additions, 51 deletionsgrowbros-frontend/src/pages/Suche.tsx
- growbros-frontend/src/pages/Wunschliste.tsx 62 additions, 48 deletionsgrowbros-frontend/src/pages/Wunschliste.tsx
- growbros-frontend/src/stylesheets/StatusMessage.css 22 additions, 0 deletionsgrowbros-frontend/src/stylesheets/StatusMessage.css
- growbros-frontend/src/utils/BackendConnectorImpl.ts 13 additions, 9 deletionsgrowbros-frontend/src/utils/BackendConnectorImpl.ts
- growbros-frontend/src/utils/IBackendConnector.ts 2 additions, 2 deletionsgrowbros-frontend/src/utils/IBackendConnector.ts
- growbros-frontend/src/utils/commonTypes.d.ts 8 additions, 4 deletionsgrowbros-frontend/src/utils/commonTypes.d.ts
- growbros-frontend/src/utils/schemas.ts 64 additions, 12 deletionsgrowbros-frontend/src/utils/schemas.ts
- src/main/java/hdm/mi/growbros/controllers/GardenController.java 7 additions, 7 deletions...in/java/hdm/mi/growbros/controllers/GardenController.java
- src/main/java/hdm/mi/growbros/controllers/GrandmaController.java 20 additions, 9 deletions...n/java/hdm/mi/growbros/controllers/GrandmaController.java
- src/main/java/hdm/mi/growbros/controllers/WishListController.java 4 additions, 5 deletions.../java/hdm/mi/growbros/controllers/WishListController.java
- src/main/java/hdm/mi/growbros/models/GardenEntry.java 4 additions, 4 deletionssrc/main/java/hdm/mi/growbros/models/GardenEntry.java
Loading
Please register or sign in to comment