Dev (!39) · Merge requests · Systemutvikling Gruppe 19 / IDATT1005_2024_Group_19

Apr 16, 2024
- Merge branch 'ignoreDBTestPipeline' into 'dev' · d516e090
  Daniel Moe Kvarsnes authored Apr 16, 2024
  
  Ignore db test pipeline See merge request !38
  d516e090
- Removed unnecessary Javadoc · c68ab5cc
  André Wikheim Merkesdal authored Apr 16, 2024
  
  c68ab5cc
- testing pipeline · 4871118a
  Daniel Moe Kvarsnes authored Apr 16, 2024
  
  4871118a
- Merge branch 'ignoreDBTestPipeline' of... · cc8ae8c3
  Daniel Moe Kvarsnes authored Apr 16, 2024
  
  Merge branch 'ignoreDBTestPipeline' of https://gitlab.stud.idi.ntnu.no/systemutvikling-gruppe-19/idatt-1005-2024-group-19 into ignoreDBTestPipeline
  cc8ae8c3
- Attempting to ignore javadoc gen · 311226e3
  Daniel Moe Kvarsnes authored Apr 16, 2024
  
  311226e3
- Merge remote-tracking branch 'origin/ignoreDBTestPipeline' into ignoreDBTestPipeline · f1a10e07
  André Wikheim Merkesdal authored Apr 16, 2024
  
  f1a10e07
- Added Javadoc on CookBookFrame.java for class variables · 1706ab50
  André Wikheim Merkesdal authored Apr 16, 2024
  
  1706ab50
- Updated javadoc · af294c38
  Daniel Moe Kvarsnes authored Apr 16, 2024
  
  af294c38
- Merge branch 'dev' into 'ignoreDBTestPipeline' · f666c418
  Daniel Moe Kvarsnes authored Apr 16, 2024
  
  Dev See merge request !37
  f666c418
- added javadoc · 42fd4a5a
  Daniel Moe Kvarsnes authored Apr 16, 2024
  
  42fd4a5a
- creating javadoc directory · 54d0668c
  Daniel Moe Kvarsnes authored Apr 16, 2024
  
  54d0668c
- Tried different config · 5d13fef4
  Daniel Moe Kvarsnes authored Apr 16, 2024
  
  5d13fef4
- Tried another config · 0937d1c7
  Daniel Moe Kvarsnes authored Apr 16, 2024
  
  0937d1c7
- fixed typo · 1e3de3a8
  Daniel Moe Kvarsnes authored Apr 16, 2024
  
  1e3de3a8
- testing pipeline · 06d66d25
  Daniel Moe Kvarsnes authored Apr 16, 2024
  
  06d66d25
- cleaned ShoppingListTest · e1b60cfb
  Daniel Moe Kvarsnes authored Apr 16, 2024
  
  e1b60cfb
- fixed build error · e3797fcd
  Daniel Moe Kvarsnes authored Apr 16, 2024
  
  e3797fcd
- Merge branch '#65 -javadoc-main-class' into 'dev' · fe1b7a6a
  André Wikheim Merkesdal authored Apr 16, 2024
  
  #65 javadoc main class See merge request !36
  fe1b7a6a
- Merge branch '#81 -review-tests-input-valid' into 'dev' · 294a5fa0
  Daniel Moe Kvarsnes authored Apr 16, 2024
  
  Added test for InputValid See merge request !35
  294a5fa0
- Finished Checkstyle for MainApplication.java · da180c2c
  André Wikheim Merkesdal authored Apr 16, 2024
  
  da180c2c
- Added test for InputValid · 3807c44b
  Daniel Moe Kvarsnes authored Apr 16, 2024
  
  3807c44b
- Merge branch '#81 -review-tests-inventory' into 'dev' · b29984dd
  Daniel Moe Kvarsnes authored Apr 16, 2024
  
  #81 review tests inventory See merge request !34
  b29984dd
- Modifyed inventory test · be3a9821
  Daniel Moe Kvarsnes authored Apr 16, 2024
  
  be3a9821
- Merge branch 'dev' into '#65 -javadoc-main-class' · 12041c90
  André Wikheim Merkesdal authored Apr 16, 2024
  
  Dev See merge request !33
  12041c90
- Added ListHandlingTest clas · 983c33c7
  Daniel Moe Kvarsnes authored Apr 16, 2024
  
  983c33c7
- Added Javadoc and constants · 3af1b55c
  André Wikheim Merkesdal authored Apr 16, 2024
  
  3af1b55c
- Merge branch '#80 -remove-cart-class' into 'dev' · 8e45190d
  Daniel Moe Kvarsnes authored Apr 16, 2024
  
  Cart and CartTest removed. Updated POM See merge request !32
  8e45190d
- reverted POM file · d009c438
  Daniel Moe Kvarsnes authored Apr 16, 2024
  
  d009c438
- One line · a2e377f9
  Jonas Grønskag Johansen authored Apr 16, 2024
  
  a2e377f9
- New fix · a2c0852f
  Jonas Grønskag Johansen authored Apr 16, 2024
  
  a2c0852f
- Cart and CartTest removed. Updated POM · d0ce1101
  Daniel Moe Kvarsnes authored Apr 16, 2024
  
  d0ce1101
- Skip dbtest when deploy · c0e8a764
  Jonas Grønskag Johansen authored Apr 16, 2024
  
  c0e8a764
- Fixed import statements to MainApplication.java · 9b526392
  André Wikheim Merkesdal authored Apr 16, 2024
  
  9b526392
- Renamed GUI to MainApplication · 9f043915
  André Wikheim Merkesdal authored Apr 16, 2024
  
  9f043915
- Fixed typos · 1e44921c
  Daniel Moe Kvarsnes authored Apr 15, 2024
  
  1e44921c
- Update file README.md · 8c102d2e
  Jonas Grønskag Johansen authored Apr 15, 2024
  
  8c102d2e
- Update file README.md · 635bfae1
  Jonas Grønskag Johansen authored Apr 15, 2024
  
  635bfae1
- Add new file · 402cca3f
  Jonas Grønskag Johansen authored Apr 15, 2024
  
  402cca3f
Apr 15, 2024
- Fixed duplicate string sonarLint for JsonToDB · 33c78330
  Daniel Moe Kvarsnes authored Apr 15, 2024
  
  33c78330
- Merge branch '#63 -update-db' into 'dev' · a56c9f0f
  Daniel Moe Kvarsnes authored Apr 15, 2024
  
  #63 update db See merge request !31
  a56c9f0f
- #63 update db · 07ea0146
  Daniel Moe Kvarsnes authored Apr 15, 2024
  
  07ea0146
- Merge branch '#65 -javadoc-models' into 'dev' · 25c8f73f
  André Wikheim Merkesdal authored Apr 15, 2024
  
  Javadoc model classes See merge request !29
  25c8f73f
- Checkstyle and Javadoc for ShoppingList.java · a2a49646
  André Wikheim Merkesdal authored Apr 15, 2024
  
  a2a49646
- Checkstyle and Javadoc for Inventory.java · 3bc95990
  André Wikheim Merkesdal authored Apr 15, 2024
  
  3bc95990
- Checkstyle and Javadoc for Ingredient.java · 182847ce
  André Wikheim Merkesdal authored Apr 15, 2024
  
  182847ce
- Checkstyle and Javadoc for Cart.java · a082c556
  André Wikheim Merkesdal authored Apr 15, 2024
  
  a082c556
Apr 14, 2024
- Merge branch '#65 -javadoc-utils' into 'dev' · eb18ed6b
  André Wikheim Merkesdal authored Apr 14, 2024
  
  #65 javadoc utils See merge request !28
  eb18ed6b
- Checkstyle and Javadoc for ListHandling.java · b801cfc9
  André Wikheim Merkesdal authored Apr 14, 2024
  
  b801cfc9
- Checkstyle and Javadoc for Json.java · 0d4043eb
  André Wikheim Merkesdal authored Apr 14, 2024
  
  0d4043eb
- Checkstyle and Javadoc for InputValid.java · 9f0a8e3e
  André Wikheim Merkesdal authored Apr 14, 2024
  
  9f0a8e3e
- Merge branch '#65 -javadoc-exceptions' into 'dev' · 613f68c9
  André Wikheim Merkesdal authored Apr 14, 2024
  
  #65 javadoc exceptions See merge request !27
  613f68c9
- Checkstyle and Javadoc for RecipeFrameException.java · ac2e395b
  André Wikheim Merkesdal authored Apr 14, 2024
  
  ac2e395b
- Checkstyle and Javadoc for DbConnectionErrorException.java · 32c53b8f
  André Wikheim Merkesdal authored Apr 14, 2024
  
  32c53b8f
- Merge branch '#65 -javadoc-dialogboxes' into 'dev' · 486e8232
  André Wikheim Merkesdal authored Apr 14, 2024
  
  #65 javadoc dialogboxes See merge request !26
  486e8232
- Javadoc and checkstyle for ErrorDialog.java · 53352a5e
  André Wikheim Merkesdal authored Apr 14, 2024
  
  53352a5e
- Javadoc and checkstyle for DialogBox.java · 2f95125e
  André Wikheim Merkesdal authored Apr 14, 2024
  
  2f95125e
- Javadoc and checkstyle for ConfirmAddRecipeDialog.java · d426a4f4
  André Wikheim Merkesdal authored Apr 14, 2024
  
  d426a4f4
- Javadoc and checkstyle for AddIngredientDialog.java · 28dc2525
  André Wikheim Merkesdal authored Apr 14, 2024
  
  28dc2525
- Fixed Sonarlint issues for Dialog Boxes · 9d989170
  André Wikheim Merkesdal authored Apr 14, 2024
  
  9d989170
- Merge branch '#65 -javadoc-database' into 'dev' · 437400ff
  André Wikheim Merkesdal authored Apr 14, 2024
  
  Added javadoc to database classes See merge request !25
  437400ff
- Merge branch '#73 -move-dialog-boxes' into 'dev' · 1c0a6b70
  Daniel Moe Kvarsnes authored Apr 14, 2024
  
  #73 move dialog boxes See merge request !24
  1c0a6b70
- #73 move dialog boxes · b297dce1
  Daniel Moe Kvarsnes authored Apr 14, 2024
  
  b297dce1
- Added javadoc to database classes · 88ec2b22
  André Wikheim Merkesdal authored Apr 14, 2024
  
  88ec2b22
- Merge branch '#65 -javadoc-applauncher' into 'dev' · 4dfd4816
  André Wikheim Merkesdal authored Apr 14, 2024
  
  Javadoc for AppLauncher.java See merge request !23
  4dfd4816
- Javadoc for AppLauncher.java · 3878c92b
  André Wikheim Merkesdal authored Apr 14, 2024
  
  3878c92b
- Merge branch '#65 -javadoc-shoppinglistframe' into 'dev' · f33138e9
  André Wikheim Merkesdal authored Apr 14, 2024
  
  Removed unused method and added javadoc to ShoppingListFrame.java See merge request !22
  f33138e9
- Removed unused method and added javadoc to ShoppingListFrame.java · d7b92a1f
  André Wikheim Merkesdal authored Apr 14, 2024
  
  d7b92a1f
- Merge branch '#65 -javadoc-recipeframe' into 'dev' · 24eb3645
  André Wikheim Merkesdal authored Apr 14, 2024
  
  Added javadoc to RecipeFrame.java See merge request !21
  24eb3645
- Added javadoc to RecipeFrame.java · baf83ec5
  André Wikheim Merkesdal authored Apr 14, 2024
  
  baf83ec5
- Merge branch '#65 -javadoc-jsonreadable' into 'dev' · 737662f7
  André Wikheim Merkesdal authored Apr 14, 2024
  
  Added javadoc to JsonReadable.java See merge request !20
  737662f7
- Added javadoc to JsonReadable.java · 95f6ae0b
  André Wikheim Merkesdal authored Apr 14, 2024
  
  95f6ae0b
- Merge branch '#65 -javadoc-itemlistframe' into 'dev' · 03884f93
  André Wikheim Merkesdal authored Apr 14, 2024
  
  Tweaked the javadoc for ItemListFrame.java See merge request !19
  03884f93
- Tweaked the javadoc for ItemListFrame.java · cf8e65e9
  André Wikheim Merkesdal authored Apr 14, 2024
  
  cf8e65e9
Apr 13, 2024
- Merge branch '#65 -javadoc-inventoryframe' into 'dev' · f0ee93b6
  André Wikheim Merkesdal authored Apr 13, 2024
  
  Javadoc for InventoryFrame.java See merge request !18
  f0ee93b6
- Javadoc for InventoryFrame.java · 2e60c2f4
  André Wikheim Merkesdal authored Apr 13, 2024
  
  2e60c2f4
- Merge branch '#65 -javadoc-header' into 'dev' · 2fe57a87
  André Wikheim Merkesdal authored Apr 13, 2024
  
  Javadoc for Header.java See merge request !17
  2fe57a87
- Javadoc for Header.java · 2966b977
  André Wikheim Merkesdal authored Apr 13, 2024
  
  2966b977
- Merge branch '#65 -javadoc-cookbookframe' into 'dev' · fcb4ec2c
  André Wikheim Merkesdal authored Apr 13, 2024
  
  Javadoc for CookBookFrame.java See merge request !16
  fcb4ec2c
- Merge branch 'dev' into '#65 -javadoc-cookbookframe' · c7bb575a
  André Wikheim Merkesdal authored Apr 13, 2024
  
  # Conflicts: # src/main/java/edu/ntnu/stud/controller/framecontroller/CookBookFrame.java
  c7bb575a
Apr 12, 2024
- Javadoc for CookBookFrame.java · b3940f9e
  André Wikheim Merkesdal authored Apr 12, 2024
  
  b3940f9e
- Merge branch '#71 -handle-DBConnect' into 'dev' · 9b5ec610
  Daniel Moe Kvarsnes authored Apr 12, 2024
  
  #71 handle db connect See merge request !15
  9b5ec610
- Merge branch 'dev' into '#71 -handle-DBConnect' · 9428fc05
  Daniel Moe Kvarsnes authored Apr 12, 2024
  
  # Conflicts: # src/main/java/edu/ntnu/stud/controller/framecontroller/CookBookFrame.java
  9428fc05
- refactored tests · 9894aea6
  Daniel Moe Kvarsnes authored Apr 12, 2024
  
  9894aea6
- Alert box - DB connection failed · 5b9381c8
  Daniel Moe Kvarsnes authored Apr 12, 2024
  
  5b9381c8
- Added spesific error handling for DBconnection · e184af11
  Daniel Moe Kvarsnes authored Apr 12, 2024
  
  e184af11
- Merge branch '#72 -refactor-cookbookframe' into 'dev' · 5815b3ac
  André Wikheim Merkesdal authored Apr 12, 2024
  
  #72 refactor cookbookframe See merge request !14
  5815b3ac
- Changed header in gui to private · 9ffc4f3b
  André Wikheim Merkesdal authored Apr 12, 2024
  
  9ffc4f3b
- Split the methods int different classes to divide responsibilities · 523c3a8b
  André Wikheim Merkesdal authored Apr 12, 2024
  
  523c3a8b
- Divided setImageFromJson to smaller methods and added constants for styles · 68d3dc43
  André Wikheim Merkesdal authored Apr 12, 2024
  
  68d3dc43
- Added a spesified exception for db · a59b1ed6
  André Wikheim Merkesdal authored Apr 12, 2024
  
  a59b1ed6
- Changed the way exceptions are thrown from dblink · bcfdcbc3
  André Wikheim Merkesdal authored Apr 12, 2024
  
  bcfdcbc3
- Merge branch '#70 -move-list-methods' into 'dev' · 96458f92
  Daniel Moe Kvarsnes authored Apr 12, 2024
  
  #70 move list methods See merge request !13
  96458f92
- List methods moved to ListHandling · 6762aa50
  Daniel Moe Kvarsnes authored Apr 12, 2024
  
  6762aa50
- Added ListHandling class · c057a924
  Daniel Moe Kvarsnes authored Apr 12, 2024
  
  c057a924
- Added TODO · 9a08cbb2
  Daniel Moe Kvarsnes authored Apr 12, 2024
  
  9a08cbb2
Apr 10, 2024
- Merge branch '#69 -confirm-full-or-remaining-recipe' into 'dev' · c07fc297
  Daniel Moe Kvarsnes authored Apr 10, 2024
  
  #69 confirm full or remaining recipe See merge request !12
  c07fc297
- #69 confirm full or remaining recipe · acd13cda
  Daniel Moe Kvarsnes authored Apr 10, 2024
  
  acd13cda
Apr 09, 2024
- Merge branch '#69 -confirm-full-or-remaining-recipe' into 'dev' · bb073f99
  Daniel Moe Kvarsnes authored Apr 9, 2024
  
  # Conflicts: # src/main/java/edu/ntnu/stud/controller/GUI.java
  bb073f99
- Removed unused tests' · 640d0309
  Daniel Moe Kvarsnes authored Apr 9, 2024
  
  640d0309
- Fixed methods in gui · 53e2128f
  André Wikheim Merkesdal authored Apr 9, 2024
  
  53e2128f

Dev

Merge request reports

Activity