f281ce1333
chore: cleanup unused code in foodpal
2026-01-22 22:56:07 +01:00
1542117ac6
fix: refresh the favourites list if any change occurs to the original list
2026-01-22 22:55:56 +01:00
ad199ea244
Merge branch 'feature/client-search-fix' into 'main'
...
fix: Search bar immediately clears search params and returns server contents after ESCAPE key-press
See merge request cse1105/2025-2026/teams/csep-team-76!87
2026-01-22 21:42:59 +01:00
7cddc0303c
fix: Search bar immediately clears search params and returns server contents after ESCAPE key-press
2026-01-22 21:04:28 +01:00
4c341aadec
Merge branch 'bugfix/ingredients-list-ctrl-renderer' into 'main'
...
fix: into initializeComponents
See merge request cse1105/2025-2026/teams/csep-team-76!86
2026-01-22 20:54:57 +01:00
d23eb34a00
fix: into initializeComponents
2026-01-22 20:51:10 +01:00
143b73c23f
Merge branch 'feature/add-duplicate-error-message' into 'main'
...
Added a special warning message when user tries to add duplicate ingredients
See merge request cse1105/2025-2026/teams/csep-team-76!58
2026-01-22 19:03:01 +01:00
76852fcd4f
Merge branch 'prevent-server-dependancy' into 'main'
...
added a Dialog sequence for when the server is not up
Closes #58
See merge request cse1105/2025-2026/teams/csep-team-76!79
2026-01-22 18:59:15 +01:00
Mei Chang van der Werff
9077df5164
Merge branch 'fix/Ingredients-ordered' into 'main'
...
Sorts ingredients in alphabetic order
Closes #75
See merge request cse1105/2025-2026/teams/csep-team-76!80
2026-01-22 16:43:47 +01:00
Rithvik Sriram
22dd603746
stray typo fix
2026-01-22 16:12:58 +01:00
Rithvik Sriram
cb4a93aeab
Fixed merge conflicts and rebased
2026-01-22 16:12:20 +01:00
Rithvik Sriram
a1df0f5b24
Made a Duplicate Exception class and made that be called instead for better robustness and consistency
2026-01-22 16:01:17 +01:00
Rithvik Sriram
e5f7df7318
Fixed pipeline issues and added comment
2026-01-22 15:51:21 +01:00
Rithvik Sriram
b985aa283f
added a special warning message when user tries to add duplicate ingredients
2026-01-22 15:51:21 +01:00
Mei Chang van der Werff
274a48c5c2
Merge branch 'ImprovedServerTests' into 'main'
...
Fixed PortChecker Server Test
See merge request cse1105/2025-2026/teams/csep-team-76!81
2026-01-22 15:34:58 +01:00
23d6d6bbf6
Merge branch 'client/feature-servings' into 'main'
...
feat(client/servings): inferring serving size from user input
Closes #72
See merge request cse1105/2025-2026/teams/csep-team-76!74
2026-01-22 15:24:46 +01:00
Aysegul Aydinlik
14a4e157ea
Merge branch 'testing-client' into 'main'
...
added IngredientControllerTest
Closes #77
See merge request cse1105/2025-2026/teams/csep-team-76!82
2026-01-22 15:17:03 +01:00
4e901f7847
fix: servings minimum as One
2026-01-22 14:52:33 +01:00
d83494c2a1
chore: move things around
2026-01-22 14:52:33 +01:00
6931367145
feat(client/main): append main UI logic to handle serving size rendering
2026-01-22 14:52:33 +01:00
8615187628
feat(client/serving): declare UI infrastructure and data deps for servings
2026-01-22 14:52:33 +01:00
23447a96d6
feat(commons/recipe): introduce weight sum calculations
2026-01-22 14:52:32 +01:00
b7bbebe222
feat(client/scaling): initial implementation
2026-01-22 14:51:03 +01:00
Aysegul Aydinlik
2dd8627f58
added IngredientControllerTest + fix pipeline
2026-01-22 14:50:52 +01:00
Aysegul Aydinlik
9603742220
added IngredientControllerTest + fix comments
2026-01-22 14:44:27 +01:00
46ba82bc0d
Merge branch 'client/feature-kcal-eval' into 'main'
...
feat(client/kcal): kcal/100g per recipe evaluation
Closes #71
See merge request cse1105/2025-2026/teams/csep-team-76!73
2026-01-22 14:40:38 +01:00
Aysegul Aydinlik
f7a1deb9b1
added IngredientControllerTest + fix pipeline fail
2026-01-22 14:31:49 +01:00
Aysegul Aydinlik
0acbb13a49
added IngredientControllerTest
2026-01-22 14:25:35 +01:00
Mei Chang van der Werff
9222999505
made the tests more readable...
2026-01-22 02:16:22 +01:00
Mei Chang van der Werff
4d17f10323
updated the port tests to the fixed findFreePort code
2026-01-22 02:15:40 +01:00
Oskar Rasieński
5915b658e6
Merge branch 'lang-fix' into 'main'
...
Lang fix
See merge request cse1105/2025-2026/teams/csep-team-76!78
2026-01-22 01:21:43 +01:00
Mei Chang van der Werff
55b3811deb
Sorts ingredients in alphabetic order
2026-01-22 01:08:54 +01:00
Rithvik Sriram
110e5e8163
added a Dialog sequence for when the server is not up, which was previously just a log msg. Now the user gets to provide their own server.
2026-01-21 22:48:07 +01:00
47d8aa7721
fix: got it
2026-01-21 16:12:00 +01:00
3a0120dc33
fix: getting to it
2026-01-21 15:53:58 +01:00
72f29467bd
fix: no more NaN
2026-01-21 14:58:06 +01:00
Oskar Rasieński
2ca0acbeef
checkstyle fix...
2026-01-21 14:50:14 +01:00
7e5137b317
feat(client/kcal): ui logic for kcal eval
2026-01-21 14:47:46 +01:00
8422734a3f
feat(commons/kcal): kcal eval infrastructure
2026-01-21 14:47:46 +01:00
Mei Chang van der Werff
06dde451f3
Merge branch 'feature/fav-highlight' into 'main'
...
A favourited recipe now becomes blue in text
Closes #74
See merge request cse1105/2025-2026/teams/csep-team-76!77
2026-01-21 14:46:35 +01:00
Oskar Rasieński
969d052230
translated ingredients menu
2026-01-21 14:34:57 +01:00
Mei Chang van der Werff
8989cab770
A favourited recipe now becomes blue in text
2026-01-21 14:21:30 +01:00
Oskar Rasieński
638220bb07
Fixed lang in main menu
2026-01-21 13:51:11 +01:00
83910eca72
Merge branch 'client/feature-recipe-scaling' into 'main'
...
feat(client/scaling): Implements client-side recipe scaling
Closes #70
See merge request cse1105/2025-2026/teams/csep-team-76!70
2026-01-19 21:12:20 +01:00
a8ec6f4f62
Merge branch 'turkish-' into 'main'
...
added turkish
Closes #73
See merge request cse1105/2025-2026/teams/csep-team-76!76
2026-01-19 20:35:28 +01:00
Mei Chang van der Werff
3ed44b3626
Merge branch 'PortChange' into 'main'
...
Portchange
Closes #64
See merge request cse1105/2025-2026/teams/csep-team-76!62
2026-01-19 20:34:01 +01:00
Aysegul
fca641b143
added turkish, replaced flag
2026-01-19 20:21:59 +01:00
54db9bddff
feat(client/scaling): initial implementation
2026-01-19 15:32:30 +01:00
2a4b6d3fce
Merge branch 'bugfix/quick-20260119' into 'main'
...
fix: use Endpoints for filtered recipe urls
See merge request cse1105/2025-2026/teams/csep-team-76!75
2026-01-19 15:27:41 +01:00
Aysegul
be056fc17e
Add Turkish locale resources
2026-01-19 15:24:50 +01:00
