Commits · 0bac57801dd35d54041a0de924c7a5510c74f18f · SE2 Projekt / Tasty Pages

Jun 19, 2023
- Merge remote-tracking branch 'origin/main' · 0bac5780
  Blersch Lara authored 1 year ago
  
  0bac5780
- tried do work on some of the todo's but failed · 35fc42cf
  Blersch Lara authored 1 year ago
  
  35fc42cf
- Name Update GUI Driver, Mehr updates zum Class Diagram, nur noch relations fehlen · ea27adde
  Dirksmöller Karin authored 1 year ago
  
  ea27adde
Jun 18, 2023
- Class Diagram Update (noch nicht fertig) zwischenstand dokumente entfernt · d9a8e690
  Dirksmöller Karin authored 1 year ago
  
  d9a8e690
- Use Case Diagram update und png · 92b8f41b
  Dirksmöller Karin authored 1 year ago
  
  92b8f41b
Jun 16, 2023
- continued with mealplan, trying to add a recipe causes exceptions · 81faffe8
  Blersch Lara authored 1 year ago
  
  81faffe8
- added error alerts when user inputs are invalid · 50ec079b
  Karsch Lukas authored 1 year ago
  
  50ec079b
- started implementing mealPlan · 29f1d2e0
  Blersch Lara authored 1 year ago
  
  29f1d2e0
- added header to ingredient-creator; in the shopping list flipStatus works and... · a33cd872
  Blersch Lara authored 1 year ago
  
  added header to ingredient-creator; in the shopping list flipStatus works and checkboxes are still checked after switching pages
  a33cd872
Jun 15, 2023
- (Recipe view) fixed bug where the ingredient label wouldn't fully show · 223febf6
  Karsch Lukas authored 1 year ago
  
  223febf6
- UI for creating categories. · cc29aeab
  Karsch Lukas authored 1 year ago
  
  cc29aeab
- added all Object IDs of GUI elements to css file · 95ce9f0b
  Dirksmöller Karin authored 1 year ago
  
  95ce9f0b
- Recipy creator GUI update and CSS style file for GUI created · e5e76535
  Dirksmöller Karin authored 1 year ago
  
  e5e76535
- shopping List works now, only thing missing is the status · fcc9328d
  Blersch Lara authored 1 year ago
  
  fcc9328d
Jun 14, 2023
- Merge remote-tracking branch 'origin/main' · 9fb72e47
  Blersch Lara authored 1 year ago
  
  9fb72e47
- tried to implement ShoppingListViewController · 4776f6f8
  Blersch Lara authored 1 year ago
  
  4776f6f8
- Upload New File · e3c35482
  Blersch Lara authored 1 year ago
  
  e3c35482
- recipe-view displays ingredients (almost correctly) · 756c7bb2
  Blersch Lara authored 1 year ago
  
  756c7bb2
Jun 13, 2023
- interface for creating ingredients and adding them to ingredient manager · c8c280b7
  Karsch Lukas authored 1 year ago
  
  c8c280b7
- (RecipeSearchController) pagination for ingredient search results · 7f6dbd91
  Karsch Lukas authored 1 year ago
  
  7f6dbd91
Jun 09, 2023
- setting an appropriate text color for categories with dark backgrounds. · 29fd1d4d
  Karsch Lukas authored 1 year ago
  
  29fd1d4d
- Merge remote-tracking branch 'origin/main' into main · 19c71cae
  Karsch Lukas authored 1 year ago
  
  19c71cae
- added app icon, added "back" button to recipe creator. now creating recipes... · 46515d40
  Karsch Lukas authored 1 year ago
  
  added app icon, added "back" button to recipe creator. now creating recipes and adding them to the recipe manager
  46515d40
- recipe-view and controller almost finished, ingredients and categories missing · c7660d97
  Blersch Lara authored 1 year ago
  
  c7660d97
- refactoring RecipeSearch, slight visual changes, now selecting ingredients in... · 76fdd62d
  Karsch Lukas authored 1 year ago
  
  refactoring RecipeSearch, slight visual changes, now selecting ingredients in recipe creator and validating number inputs
  76fdd62d
Jun 08, 2023
- now displaying recipe images in preview and recipe view · 04e34ae4
  Karsch Lukas authored 1 year ago
  
  04e34ae4
- Did some work on the recipe creator (still wip). added 3 new GUI components · 0814037f
  Karsch Lukas authored 1 year ago
  
  0814037f
- continued recipe-view and controller, image path still not working · 97383520
  Blersch Lara authored 1 year ago
  
  97383520
- continued recipe-view and controller, image path still not working · bfe245ed
  Blersch Lara authored 1 year ago
  
  bfe245ed
- actually fixed hashcode bug for ingredients, now works in debug and normal mode · b7924e7c
  Karsch Lukas authored 1 year ago
  
  b7924e7c
Jun 07, 2023
- fixed hashcode bug for ingredients · 420c7785
  Karsch Lukas authored 1 year ago
  
  420c7785
- Merge remote-tracking branch 'origin/main' · b8384dd9
  Blersch Lara authored 1 year ago
  
  b8384dd9
- continued recipe-view and started to implement controller · 3d823525
  Blersch Lara authored 1 year ago
  
  3d823525
- Upload New File · 0427b9a6
  Hübner Jan authored 1 year ago
  
  0427b9a6
Jun 06, 2023
- Merge remote-tracking branch 'origin/main' into main · ebcd4b87
  Karsch Lukas authored 1 year ago
  
  ebcd4b87
- final modifications to make the file manager work · 64630f09
  Karsch Lukas authored 1 year ago
  
  64630f09
- Merge remote-tracking branch 'origin/main' · 3477d9f9
  Blersch Lara authored 1 year ago
  
  3477d9f9
- starting to build recipe-view.fxml, still a lot to do · 18ab4d94
  Blersch Lara authored 1 year ago
  
  18ab4d94
- Merge branch 'implementing_file_manager' into 'main' · 61fe6a1d
  Karsch Lukas authored 1 year ago
  
  Merging file manager into main See merge request !1
  61fe6a1d
- Merge branch 'main' into 'implementing_file_manager' · ac12e18f
  Karsch Lukas authored 1 year ago
  
  # Conflicts: # src/main/java/mi/hdm/TastyPages.java # src/main/java/mi/hdm/controllers/BaseController.java # src/main/java/mi/hdm/controllers/HeaderController.java # src/main/java/mi/hdm/controllers/MainPageController.java # src/main/java/mi/hdm/recipes/Recipe.java # src/main/java/mi/hdm/recipes/RecipeSearch.java # src/test/java/mi/hdm/recipes/RecipeSearchTest.java
  ac12e18f