Commit graph

Select branches

Hide pull requests

main

v1.0

Mono Color

• bb77c83289 Merge branch 'fix/janky-ingredients-list' into 'main' main v1.0 origin/main origin/HEAD mirror/main mirror/HEAD Steven Liu 2026-01-24 14:53:08 +01:00
• aec8a6bc17
  
  fix: vague ingredient description now persists origin/fix/janky-ingredients-list Steven Liu 2026-01-24 14:48:22 +01:00
• 0da9490a60
  
  fix: list cell now remembers the last ingredient selected Steven Liu 2026-01-24 14:43:21 +01:00
• a32f4cd781 Merge branch 'fix/even-better-i18n' into 'main' Natalia Cholewa 2026-01-24 14:30:33 +01:00
• da1f54f12f fix: improve i18n Natalia Cholewa 2026-01-24 14:25:39 +01:00
• 2c4384872c Merge branch 'fix/ui-full-i18n' into 'main' Natalia Cholewa 2026-01-24 13:52:56 +01:00
• b4c5652070
  
  docs: minutes week 9 (final) Steven Liu 2026-01-24 13:25:52 +01:00
• 9b1147c6c0
  
  feat(client/lang): full UI i18n impl for each language origin/fix/ui-full-i18n Steven Liu 2026-01-23 22:41:35 +01:00
• b942862dc9 Merge branch 'feature/pie-chart' into 'main' Natalia Cholewa 2026-01-23 21:44:30 +01:00
• bc852ce3d6 fix: pie chart refreshing improperly Natalia Cholewa 2026-01-23 21:17:31 +01:00
• 7946cd3df2 feat: translations for pie chart Natalia Cholewa 2026-01-23 14:52:34 +01:00
• c1301dad28 feat: pie chart for nutrients Natalia Cholewa 2026-01-23 13:48:48 +01:00
• 167a80c84a Merge branch 'fix/normalized-units' into 'main' Steven Liu 2026-01-23 21:20:25 +01:00
• 3e8442e517 Merge branch 'AddOverview' into 'main' Steven Liu 2026-01-23 15:13:42 +01:00
• 91a8a13369
  
  chore: update README to express implemented features Steven Liu 2026-01-23 15:05:15 +01:00
• 2f56d7a760 feat: translations for pie chart origin/feature/pie-chart Natalia Cholewa 2026-01-23 14:52:34 +01:00
• 58cc86c843 feat: pie chart for nutrients Natalia Cholewa 2026-01-23 13:48:48 +01:00
• 33e7c7386e docs: agenda for week 09 Natalia Cholewa 2026-01-23 12:21:29 +01:00
• a5cdcaac14 docs: agenda for week 09 Natalia Cholewa 2026-01-23 12:20:03 +01:00
• 2c54833c6b docs: agenda for week 09 Natalia Cholewa 2026-01-23 12:18:34 +01:00
• b5348a4c24 feedback w8 Maria Dumitrescu 2026-01-23 09:27:13 +01:00
• 6d4c33fa10 finished 4.5 last remaining points origin/AddOverview Aysegul Aydinlik 2026-01-23 02:55:27 +01:00
• e17a75fcd5 Merge branch 'lang/zh-XX' into 'main' Steven Liu 2026-01-23 00:44:02 +01:00
• 827fe195a9
  
  fix: static member of Config declaring all languages supported by the application origin/lang/zh-XX Steven Liu 2026-01-22 23:17:19 +01:00
• dda01f3bfe
  
  chore(lang): adds Chinese that looks just a liiiiiiittle bit different Steven Liu 2026-01-17 14:26:34 +01:00
• a3c08170d3
  
  chore(lang): zh_TW Steven Liu 2026-01-17 14:21:35 +01:00
• b82a8f7d33 Merge branch 'searchbar-fix' into 'main' Aysegul Aydinlik 2026-01-23 00:33:57 +01:00
• 1fd3b26faa Merge branch 'feature/shopping-list-crud' into 'main' Steven Liu 2026-01-23 00:33:08 +01:00
• 186e74ddd3 Merge branch 'feature/client-shopping-list-view' into 'main' Steven Liu 2026-01-23 00:31:57 +01:00
• f1fc55f674 Merge branch 'extra-server-tests' into 'main' Rithvik Sriram 2026-01-22 23:24:26 +01:00
• bfe6505c54 Merge branch 'fix/favourites-rendering' into 'main' Steven Liu 2026-01-22 23:21:48 +01:00
• f281ce1333
  
  chore: cleanup unused code in foodpal origin/fix/favourites-rendering Steven Liu 2026-01-22 22:56:07 +01:00
• 1542117ac6
  
  fix: refresh the favourites list if any change occurs to the original list Steven Liu 2026-01-22 22:55:56 +01:00
• 4d57f84ccb Added a few extra tests in RecipeControllerTest Rithvik Sriram 2026-01-22 22:37:49 +01:00
• be1b4b9ee3 added a feature and meaningful addition origin/searchbar-fix Aysegul Aydinlik 2026-01-22 21:50:13 +01:00
• ad199ea244 Merge branch 'feature/client-search-fix' into 'main' Steven Liu 2026-01-22 21:42:59 +01:00
• 7cddc0303c
  
  fix: Search bar immediately clears search params and returns server contents after ESCAPE key-press origin/feature/client-search-fix Steven Liu 2026-01-22 21:04:28 +01:00
• 4c341aadec Merge branch 'bugfix/ingredients-list-ctrl-renderer' into 'main' Steven Liu 2026-01-22 20:54:57 +01:00
• d23eb34a00
  
  fix: into initializeComponents origin/bugfix/ingredients-list-ctrl-renderer Steven Liu 2026-01-22 20:51:10 +01:00
• e3e176939c fix: test fix after changes origin/fix/normalized-units Mei Chang van der Werff 2026-01-22 20:26:52 +01:00
• 91997ae251 2 decimal limit Mei Chang van der Werff 2026-01-22 20:18:06 +01:00
• 234c8c3d64
  
  feat(client/shopping): fxml definition for various UI elements origin/feature/shopping-list-crud Steven Liu 2026-01-22 19:54:49 +01:00
• 670de432c5
  
  feat(client/shopping): delegate list view cell rendering and make add element handler Steven Liu 2026-01-22 19:54:33 +01:00
• 795926298e
  
  feat(client/shopping): create custom editable shopping list cell element Steven Liu 2026-01-22 19:53:27 +01:00
• f03c12cc0f
  
  feat(client/shopping): create add ingredient modal Steven Liu 2026-01-22 19:52:53 +01:00
• 3ca526e0f1 switched to switch case Mei Chang van der Werff 2026-01-22 19:07:26 +01:00
• 143b73c23f Merge branch 'feature/add-duplicate-error-message' into 'main' Steven Liu 2026-01-22 19:03:01 +01:00
• 76852fcd4f Merge branch 'prevent-server-dependancy' into 'main' Steven Liu 2026-01-22 18:59:15 +01:00
• 483617c5bf
  
  feat(client/fxml): add relevant components Steven Liu 2026-01-22 18:46:52 +01:00
• 21b2465b91
  
  feat(client/service/shop): functional service backend Steven Liu 2026-01-22 18:46:33 +01:00
• c0107d752a
  
  feat(client/shoplist): UI control logic for add all to list Steven Liu 2026-01-22 18:45:45 +01:00
• 40cfc0b98e
  
  fix(client/logging): added slf4j-api to client pom.xml Steven Liu 2026-01-22 18:44:25 +01:00
• d732aee6de fix: pipeline not passing :( origin/feature/client-shopping-list-view Natalia Cholewa 2026-01-22 17:33:53 +01:00
• 6cfd6ab82c feat: shopping list view Natalia Cholewa 2026-01-22 17:21:40 +01:00
• 70dfc7e983 fix: non-functional API Steven Liu 2026-01-21 13:47:54 +01:00
• 5315fe3df4 feat(client/nutrition-model): init modules for shopping list; missing impl but it has interface :) Steven Liu 2026-01-21 13:38:02 +01:00
• 9077df5164 Merge branch 'fix/Ingredients-ordered' into 'main' Mei Chang van der Werff 2026-01-22 16:43:47 +01:00
• 22dd603746 stray typo fix origin/feature/add-duplicate-error-message Rithvik Sriram 2026-01-22 16:12:58 +01:00
• cb4a93aeab Fixed merge conflicts and rebased Rithvik Sriram 2026-01-22 16:12:20 +01:00
• a1df0f5b24 Made a Duplicate Exception class and made that be called instead for better robustness and consistency Rithvik Sriram 2026-01-16 14:03:14 +01:00
• e5f7df7318 Fixed pipeline issues and added comment Rithvik Sriram 2026-01-15 16:35:31 +01:00
• b985aa283f added a special warning message when user tries to add duplicate ingredients Rithvik Sriram 2026-01-15 15:24:21 +01:00
• 274a48c5c2 Merge branch 'ImprovedServerTests' into 'main' Mei Chang van der Werff 2026-01-22 15:34:58 +01:00
• 23d6d6bbf6 Merge branch 'client/feature-servings' into 'main' Steven Liu 2026-01-22 15:24:46 +01:00
• 14a4e157ea Merge branch 'testing-client' into 'main' Aysegul Aydinlik 2026-01-22 15:17:03 +01:00
• 37fd3b18be added tests Mei Chang van der Werff 2026-01-22 15:06:30 +01:00
• 4e901f7847
  
  fix: servings minimum as One origin/client/feature-servings Steven Liu 2026-01-21 15:05:57 +01:00
• d83494c2a1
  
  chore: move things around Steven Liu 2026-01-21 15:05:07 +01:00
• 6931367145
  
  feat(client/main): append main UI logic to handle serving size rendering Steven Liu 2026-01-19 14:39:23 +01:00
• 8615187628
  
  feat(client/serving): declare UI infrastructure and data deps for servings Steven Liu 2026-01-19 14:39:01 +01:00
• 23447a96d6
  
  feat(commons/recipe): introduce weight sum calculations Steven Liu 2026-01-19 14:38:21 +01:00
• b7bbebe222
  
  feat(client/scaling): initial implementation Steven Liu 2026-01-18 14:18:19 +01:00
• 2dd8627f58 added IngredientControllerTest + fix pipeline origin/testing-client Aysegul Aydinlik 2026-01-22 14:50:52 +01:00
• 8238e9b462 fix: magic numbers Mei Chang van der Werff 2026-01-22 14:50:48 +01:00
• abe9750b9f Ingredients in the ingredient view are alphabetically ordered Mei Chang van der Werff 2026-01-22 14:45:20 +01:00
• 9603742220 added IngredientControllerTest + fix comments Aysegul Aydinlik 2026-01-22 14:44:27 +01:00
• 46ba82bc0d Merge branch 'client/feature-kcal-eval' into 'main' Steven Liu 2026-01-22 14:40:38 +01:00
• f7a1deb9b1 added IngredientControllerTest + fix pipeline fail Aysegul Aydinlik 2026-01-22 14:31:49 +01:00
• 0acbb13a49 added IngredientControllerTest Aysegul Aydinlik 2026-01-22 14:25:35 +01:00
• 9222999505 made the tests more readable... origin/ImprovedServerTests Mei Chang van der Werff 2026-01-22 02:16:22 +01:00
• 4d17f10323 updated the port tests to the fixed findFreePort code Mei Chang van der Werff 2026-01-22 02:15:40 +01:00
• 5915b658e6 Merge branch 'lang-fix' into 'main' Oskar Rasieński 2026-01-22 01:21:43 +01:00
• 55b3811deb Sorts ingredients in alphabetic order origin/fix/Ingredients-ordered Mei Chang van der Werff 2026-01-22 01:08:54 +01:00
• 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. origin/prevent-server-dependancy Rithvik Sriram 2026-01-21 22:48:07 +01:00
• 47d8aa7721
  
  fix: got it origin/client/feature-kcal-eval Steven Liu 2026-01-21 16:12:00 +01:00
• 3a0120dc33
  
  fix: getting to it Steven Liu 2026-01-21 15:53:58 +01:00
• 72f29467bd
  
  fix: no more NaN Steven Liu 2026-01-21 14:58:06 +01:00
• 2ca0acbeef checkstyle fix... Oskar Rasieński 2026-01-21 14:50:14 +01:00
• 7e5137b317
  
  feat(client/kcal): ui logic for kcal eval Steven Liu 2026-01-18 18:19:11 +01:00
• 8422734a3f
  
  feat(commons/kcal): kcal eval infrastructure Steven Liu 2026-01-18 18:18:45 +01:00
• 06dde451f3 Merge branch 'feature/fav-highlight' into 'main' Mei Chang van der Werff 2026-01-21 14:46:35 +01:00
• 969d052230 translated ingredients menu origin/lang-fix Oskar Rasieński 2026-01-21 14:34:57 +01:00
• 8989cab770 A favourited recipe now becomes blue in text origin/feature/fav-highlight Mei Chang van der Werff 2026-01-21 14:21:30 +01:00
• 638220bb07 Fixed lang in main menu Oskar Rasieński 2026-01-21 13:51:11 +01:00
• 11b038de1d
  
  fix: non-functional API origin/feature/client-shopping-list-models Steven Liu 2026-01-21 13:47:54 +01:00
• fe2f9ac1c3
  
  feat(client/nutrition-model): init modules for shopping list; missing impl but it has interface :) Steven Liu 2026-01-21 13:38:02 +01:00
• 83910eca72 Merge branch 'client/feature-recipe-scaling' into 'main' Steven Liu 2026-01-19 21:12:20 +01:00
• a8ec6f4f62 Merge branch 'turkish-' into 'main' Steven Liu 2026-01-19 20:35:28 +01:00
• 3ed44b3626 Merge branch 'PortChange' into 'main' Mei Chang van der Werff 2026-01-19 20:34:01 +01:00
• fca641b143 added turkish, replaced flag Aysegul 2026-01-19 20:21:59 +01:00