Merge remote-tracking branch 'origin/main' into bugfix/fix-tests
# Conflicts: # src/main/java/ntnu/idatt2016/v233/SmartMat/service/group/FridgeService.java
No related branches found
No related tags found
Showing
- src/main/java/ntnu/idatt2016/v233/SmartMat/controller/ShoppingListController.java 3 additions, 1 deletion...2016/v233/SmartMat/controller/ShoppingListController.java
- src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/FridgeController.java 0 additions, 19 deletions...2016/v233/SmartMat/controller/group/FridgeController.java
- src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/GroupController.java 56 additions, 0 deletions...t2016/v233/SmartMat/controller/group/GroupController.java
- src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/WasteController.java 36 additions, 0 deletions...t2016/v233/SmartMat/controller/group/WasteController.java
- src/main/java/ntnu/idatt2016/v233/SmartMat/controller/product/ProductController.java 4 additions, 3 deletions...6/v233/SmartMat/controller/product/ProductController.java
- src/main/java/ntnu/idatt2016/v233/SmartMat/controller/user/UserController.java 18 additions, 16 deletions...att2016/v233/SmartMat/controller/user/UserController.java
- src/main/java/ntnu/idatt2016/v233/SmartMat/dto/request/FridgeProductRequest.java 1 addition, 2 deletions...t2016/v233/SmartMat/dto/request/FridgeProductRequest.java
- src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Recipe.java 6 additions, 0 deletions...main/java/ntnu/idatt2016/v233/SmartMat/entity/Recipe.java
- src/main/java/ntnu/idatt2016/v233/SmartMat/entity/Waste.java 3 additions, 0 deletionssrc/main/java/ntnu/idatt2016/v233/SmartMat/entity/Waste.java
- src/main/java/ntnu/idatt2016/v233/SmartMat/entity/fridgeProduct/FridgeProductAsso.java 9 additions, 3 deletions...v233/SmartMat/entity/fridgeProduct/FridgeProductAsso.java
- src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Fridge.java 1 addition, 1 deletion...ava/ntnu/idatt2016/v233/SmartMat/entity/group/Fridge.java
- src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/Group.java 4 additions, 2 deletions...java/ntnu/idatt2016/v233/SmartMat/entity/group/Group.java
- src/main/java/ntnu/idatt2016/v233/SmartMat/entity/group/UserGroupAsso.java 3 additions, 2 deletions...u/idatt2016/v233/SmartMat/entity/group/UserGroupAsso.java
- src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Allergy.java 12 additions, 0 deletions.../ntnu/idatt2016/v233/SmartMat/entity/product/Allergy.java
- src/main/java/ntnu/idatt2016/v233/SmartMat/entity/product/Product.java 3 additions, 3 deletions.../ntnu/idatt2016/v233/SmartMat/entity/product/Product.java
- src/main/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java 3 additions, 3 deletions...n/java/ntnu/idatt2016/v233/SmartMat/entity/user/User.java
- src/main/java/ntnu/idatt2016/v233/SmartMat/repository/RecipeRepository.java 1 addition, 1 deletion.../idatt2016/v233/SmartMat/repository/RecipeRepository.java
- src/main/java/ntnu/idatt2016/v233/SmartMat/repository/group/GroupRepository.java 3 additions, 0 deletions...t2016/v233/SmartMat/repository/group/GroupRepository.java
- src/main/java/ntnu/idatt2016/v233/SmartMat/repository/group/UserGroupAssoRepository.java 8 additions, 0 deletions...33/SmartMat/repository/group/UserGroupAssoRepository.java
- src/main/java/ntnu/idatt2016/v233/SmartMat/service/ShoppingListService.java 8 additions, 6 deletions.../idatt2016/v233/SmartMat/service/ShoppingListService.java
Loading
Please register or sign in to comment