Resolve "Add option to change number of groceries in Pantry and Shoppinglist" (!65) · Merge requests · gruppe12 / idatt1005_2024_group12 · GitLab

Snippets Groups Projects

Merged Jon Bergland requested to merge 123-add-option-to-change-number-of-groceries-in-pantry-and-shoppinglist into dev 11 months ago

Apr 02, 2024
- Fix: Resolve merge conflict · b9ac6343
  Jon Bergland authored 11 months ago
  
  b9ac6343
- Merge branch 'dev' into '123-add-option-to-change-number-of-groceries-in-pantry-and-shoppinglist' · 8c278369
  Jon Bergland authored 11 months ago
```
# Conflicts:
#   src/main/java/stud/ntnu/idatt1005/pantrypal/controllers/ShoppingListController.java
#   src/main/java/stud/ntnu/idatt1005/pantrypal/views/components/AddShoppingListElement.java
```
  8c278369
Mar 28, 2024
- Refactor: Use styling from pantry.css and extract methods from constructor · a631737e
  Jon Bergland authored 11 months ago
  
  a631737e
- Feat: Add spinner for usercontroll of quantity of grocery in Pantry · 16c0cf93
  Jon Bergland authored 11 months ago
  
  16c0cf93
- Fix: Add a try-catch to catch exception thrown in register · 1ed68115
  Jon Bergland authored 11 months ago
  
  1ed68115
- Feat: Add a spinner to GroceryListElement so one can change the quantity of a Grocery · 7c80e283
  Jon Bergland authored 11 months ago
  
  7c80e283
- Feat: Add a method to not overwrite an existing grocery element, but add to it · caf2eb37
  Jon Bergland authored 11 months ago
  
  caf2eb37
- Feat: Add a spinner to represent quantity for a grocery · 19ce3001
  Jon Bergland authored 11 months ago
  
  19ce3001