Oskar Rasieński
|
caeacf86e0
|
Made Delete msg take Recipe instead of id and made alert for recipe mourning.
|
2026-01-16 19:13:35 +01:00 |
|
Oskar Rasieński
|
675e2799a5
|
Fixed usages of delete.
|
2026-01-16 19:12:33 +01:00 |
|
Oskar Rasieński
|
face654aa5
|
Made delete() return a deepcopy of recipe.
|
2026-01-16 19:11:48 +01:00 |
|
Oskar Rasieński
|
cce24ab61d
|
Added isPending to ws dataservice
|
2026-01-16 19:04:51 +01:00 |
|
Aysegul Aydinlik
|
ecccebe7c5
|
Merge branch 'updated-button' into 'main'
Update badge addition
Closes #66
See merge request cse1105/2025-2026/teams/csep-team-76!63
|
2026-01-16 16:43:39 +01:00 |
|
Mei Chang van der Werff
|
61562d58dc
|
added some tests
|
2026-01-16 16:30:37 +01:00 |
|
Aysegul Aydinlik
|
1abbeee1ae
|
Merge branch 'client/feature-ingredient-nutrition-view' into 'main'
feat(client/nutrition): Nutrition & Ingredient list view
Closes #54 and #56
See merge request cse1105/2025-2026/teams/csep-team-76!54
|
2026-01-16 16:12:17 +01:00 |
|
Aysegul
|
b739c78170
|
Update badge addition
|
2026-01-16 15:05:53 +01:00 |
|
Aysegul Aydinlik
|
90653ec312
|
Merge branch 'Server-testing' into 'main'
IngredientController test + a small refactor
Closes #61 and #62
See merge request cse1105/2025-2026/teams/csep-team-76!61
|
2026-01-16 15:05:12 +01:00 |
|
Rithvik Sriram
|
920eca13d3
|
Merge branch 'feature/Persitsting_language_options' into 'main'
Add persistent language selection with ConfigService integration
Closes #25
See merge request cse1105/2025-2026/teams/csep-team-76!57
|
2026-01-16 12:33:00 +01:00 |
|
Mei Chang van der Werff
|
45bc4e1a1c
|
Checkstyle errors fix
|
2026-01-16 03:36:23 +01:00 |
|
Mei Chang van der Werff
|
1c4085ce51
|
actually set the prgram to the free port
|
2026-01-16 03:30:37 +01:00 |
|
Mei Chang van der Werff
|
bc144b52ae
|
Searching for available port method
|
2026-01-16 03:30:11 +01:00 |
|
Aysegul Aydinlik
|
e2ccad1116
|
made a few tests for ingredients also did a TODO, made the code for RecipeControllerTest a little bit more readable too
|
2026-01-15 23:00:47 +01:00 |
|
Oskar Rasieński
|
780724c14a
|
Merge branch 'client-imposter-fix' into 'main'
Fixed Języki having UTF-8 ? instead of ę.
Closes #65
See merge request cse1105/2025-2026/teams/csep-team-76!60
|
2026-01-15 17:40:57 +01:00 |
|
Oskar Rasieński
|
d278c31993
|
Improved comments
|
2026-01-15 17:38:14 +01:00 |
|
|
|
caecab5f41
|
Merge branch 'PENGUIN' into 'main'
added the penguin SELF MADE
Closes #63
See merge request cse1105/2025-2026/teams/csep-team-76!59
|
2026-01-15 17:36:36 +01:00 |
|
|
|
c5f338bf74
|
chore: cleanup
|
2026-01-15 17:24:19 +01:00 |
|
|
|
9f7f32beff
|
fix(commons/ingredient): add missing setters
|
2026-01-15 17:15:05 +01:00 |
|
|
|
1bfc103ecc
|
feat(client/nutrition): updated nutrition UI modelling
Uses "idiomatic JavaFX" to model automatic update propagation by object
view models.
|
2026-01-15 17:12:18 +01:00 |
|
|
|
b1bb4ad242
|
feat(client/utils): create update PATCH util function
|
2026-01-15 17:12:18 +01:00 |
|
|
|
6b851767e7
|
chore: integrate changes from newest main
|
2026-01-15 17:12:18 +01:00 |
|
Aysegul Aydinlik
|
ddd81814e5
|
added the penguin SELF MADE
|
2026-01-15 16:05:29 +01:00 |
|
Rithvik Sriram
|
b972023a6e
|
Added changes where when the lang select menu gets initialized, the value is set to the previously selected language
|
2026-01-15 13:46:42 +01:00 |
|
Rithvik Sriram
|
981b64ae11
|
Removed redundant listener
|
2026-01-15 13:34:01 +01:00 |
|
Rithvik Sriram
|
5a17179fcb
|
Merge branch 'fix/wiring_print_button_with_functionality' into 'main'
wiring the print button with the export service
See merge request cse1105/2025-2026/teams/csep-team-76!51
|
2026-01-15 13:12:50 +01:00 |
|
Aysegul Aydinlik
|
8542e66869
|
Agenda-08
|
2026-01-15 12:38:36 +01:00 |
|
Oskar Rasieński
|
22a8bc4708
|
Merge branch 'client/server-utils-tests-mock' into 'main'
Client/server utils tests mock
See merge request cse1105/2025-2026/teams/csep-team-76!56
|
2026-01-15 01:07:59 +01:00 |
|
Rithvik Sriram
|
916fa07418
|
Add persistent language selection with ConfigService integration
|
2026-01-15 00:29:12 +01:00 |
|
Rithvik Sriram
|
069e60ef71
|
Refactored tests based on new constructor for recipes
|
2026-01-14 23:12:03 +01:00 |
|
Rithvik Sriram
|
6caf4eaa61
|
Merge branch 'main' into 'fix/wiring_print_button_with_functionality'
# Conflicts: fixed import merge conflict
# client/src/main/java/client/scenes/recipe/RecipeDetailCtrl.java
|
2026-01-14 22:15:53 +01:00 |
|
Oskar Rasieński
|
5ef14ae5ee
|
Improved comments
|
2026-01-14 19:54:56 +01:00 |
|
Oskar Rasieński
|
443908e7b6
|
Tests with wiremock
|
2026-01-14 19:41:34 +01:00 |
|
Oskar Rasieński
|
33b73c44b8
|
Wrong comment
|
2026-01-14 19:36:40 +01:00 |
|
Oskar Rasieński
|
e4fd15b120
|
fixed weird spacing
|
2026-01-14 19:36:27 +01:00 |
|
Oskar Rasieński
|
da0c401168
|
wiremock dependency
|
2026-01-14 19:06:26 +01:00 |
|
Oskar Rasieński
|
9008bdd026
|
Ingredient Constructors for testing
|
2026-01-14 19:06:09 +01:00 |
|
Oskar Rasieński
|
04c0315f3e
|
Merge branch 'bugfix/add-ingredient' into 'main'
fix(server) Fixed error when adding ingredient.
See merge request cse1105/2025-2026/teams/csep-team-76!55
|
2026-01-14 18:52:56 +01:00 |
|
Oskar Rasieński
|
d37d95f1d4
|
fixed ingredient test
|
2026-01-14 18:45:27 +01:00 |
|
Oskar Rasieński
|
f048e0fe3e
|
Fixed error when adding ingredient
|
2026-01-14 18:39:14 +01:00 |
|
Mei Chang van der Werff
|
624a0cbe86
|
Merge branch 'bugfix-configServiceTest' into 'main'
Skipped tests aren't skipped anymore
Closes #46
See merge request cse1105/2025-2026/teams/csep-team-76!50
|
2026-01-13 17:28:28 +01:00 |
|
Mei Chang van der Werff
|
4fce3d3551
|
fixing my 'fix'
|
2026-01-13 16:46:30 +01:00 |
|
Mei Chang van der Werff
|
92c1c0eb15
|
Merge conflict fix
|
2026-01-13 16:07:36 +01:00 |
|
|
|
adc79e2d71
|
Merge branch 'feature/client-recipe-i18n' into 'main'
Client recipe internationalization
Closes #39
See merge request cse1105/2025-2026/teams/csep-team-76!49
|
2026-01-13 16:05:21 +01:00 |
|
Aysegul Aydinlik
|
07d7e1b1a4
|
Merge branch 'fix/ingredient-step-list-sizing' into 'main'
style(client): align ingredient and step list widths
Closes #48
See merge request cse1105/2025-2026/teams/csep-team-76!46
|
2026-01-13 16:04:21 +01:00 |
|
|
|
488634f051
|
docs(readme): add config options & usage
|
2026-01-11 20:56:29 +01:00 |
|
Mei Chang van der Werff
|
625383070d
|
refactor: ConfigServiceTest looks normal again
|
2026-01-10 20:01:43 +01:00 |
|
Mei Chang van der Werff
|
30635b4a21
|
added tests to configTest class to improve coverage
|
2026-01-10 20:01:06 +01:00 |
|
Mei Chang van der Werff
|
78fdb64bdf
|
added test to improve coverage
|
2026-01-10 19:50:31 +01:00 |
|
Mei Chang van der Werff
|
c83d80bb74
|
Removed the server dependancy, so they aren't skipped
|
2026-01-10 19:17:07 +01:00 |
|
