# Conflicts:
#	growbros-frontend/src/pages/Home.tsx
#	growbros-frontend/src/pages/Suche.tsx
#	growbros-frontend/src/stylesheets/Home.css
#	src/main/java/hdm/mi/growbros/controllers/AuthenticationController.java
#	src/main/java/hdm/mi/growbros/controllers/GrandmaController.java
#	src/main/java/hdm/mi/growbros/service/AuthenticationService.java
#	src/main/resources/plants/default-plants.json

#51 tip des tages ist jetzt ein objekt, schön anzeigen mit link zur pflanze. bug fix wo tips übersprungen wurden

Resolve "Integration tests"

Closes #59

See merge request !50

#59 small fix in plants controller. helper service: json mapper. fix response code in Rest error handler. more integration tests for plants

tried to fix GardenIntegrationTest, but shoulAddPlant_code201 fails if all tests are running at once

# Conflicts:
#	src/main/java/hdm/mi/growbros/models/WishListEntry.java

Change head: logo, document title. slight adjustments to home page 

Closes #58

See merge request !56

adding easteregg to default-plants.json, whowing user error when one occurs while fetching data in Grandma.tsx, adding Javadoc in GrandmaService

correct status code when deleting wishlist entry

See merge request !54

Wishlist unittests

See merge request !51

Update README.md

See merge request !53

quick fix, error message is not permanently shown anymore

See merge request !52

added package stage & test reports for CI/CD

See merge request !48

GroundType ist jetzt nicht mehr überall null. Um die Änderungen zu sehen, müsst ihr in eure h2 console: http://localhost:8080/h2-console (anmelden mit user und pw "admin"). Dann den plants table auswählen und folgenden command ausführen: DELETE FROM PLANTS;
Falls es dabei zu Fehlern kommt, müsst ihr die Tabellen WishlistEntry und GardenEntry ebenfalls leeren. Anschließend die growbros-app neu starten.

Closes #57

See merge request !49

fix bug in schemas.ts (imageUrl can now be null) + merged main into my branch

Closes #45

See merge request !44