Mei Chang van der Werff
d62422bbdb
fix: merge conflict
2026-01-11 18:54:11 +01:00
Mei Chang van der Werff
208a929708
Made the program actually use the bundles
2026-01-11 18:38:27 +01:00
Mei Chang van der Werff
d13d9e28d0
Added the translation of the favorite button
2026-01-11 18:37:47 +01:00
Mei Chang van der Werff
076e13486c
Changed the fxml files to using internationalized strings
2026-01-11 18:36:47 +01:00
Maria Dumitrescu
2fcef88554
feedback w7
2026-01-10 14:18:34 +01:00
cd62192ddc
Merge branch 'bugfix/null-amount-name' into 'main'
...
fix(client/ui): silently fail ingredient input if any is null
Closes #50
See merge request cse1105/2025-2026/teams/csep-team-76!45
2026-01-10 13:40:20 +01:00
e5259c8253
fix(client/ui): silently fail ingredient input if any is null
2026-01-10 13:39:26 +01:00
Aysegul
aacb8d97c8
added minutes of week 7
2026-01-09 23:40:35 +01:00
Aysegul Aydinlik
3c33f2ff35
Merge branch 'idkwhattonameitanymore' into 'main'
...
added pop up view ingredients + warnings for delete
Closes #53 and #55
See merge request cse1105/2025-2026/teams/csep-team-76!48
2026-01-09 22:47:54 +01:00
Natalia Cholewa
2224fe1f51
Merge branch 'feature/server-recipe-i18n' into 'main'
...
Server-side recipe internationalization
See merge request cse1105/2025-2026/teams/csep-team-76!47
2026-01-09 22:28:31 +01:00
Aysegul
fe4d3ff2d6
added pop up view ingredients + warnings for delete removed the star import should also fix the test issue
2026-01-09 22:16:30 +01:00
Aysegul
bab9046682
added pop up view ingredients + warnings for delete removed the star import
2026-01-09 21:50:30 +01:00
Aysegul
ec60b7b7d3
added pop up view ingredients + warnings for delete removed the star import
2026-01-09 21:47:10 +01:00
Aysegul
9aae8f918f
added pop up view ingredients + warnings for delete
2026-01-09 21:42:57 +01:00
07adedde3e
Merge branch 'feature/server_search_bar' into 'main'
...
Added backend server search functionality with unit tests
Closes #33
See merge request cse1105/2025-2026/teams/csep-team-76!33
2026-01-09 16:35:02 +01:00
Natalia Cholewa
97774cf709
fix: tests didn't compile oops
2026-01-09 16:34:42 +01:00
Mei Chang van der Werff
ec5881790d
updated Provisionary tasks for agenda-7.md
2026-01-09 15:38:47 +01:00
95213519a3
chore(gitignore): add trace.db and config.json to ignore-list
2026-01-09 15:11:58 +01:00
Natalia Cholewa
74b6f25e24
feat: language in recipes
2026-01-09 14:54:42 +01:00
Rithvik Sriram
caa78515cf
Merge branch 'main' into 'feature/server_search_bar'
...
# Conflicts:
# server/src/main/java/server/api/RecipeController.java
2026-01-09 13:49:51 +01:00
1c9ffb9d13
Merge branch 'etc/logging' into 'main'
...
Logging for flow of the data exchange between client/server
Closes #37
See merge request cse1105/2025-2026/teams/csep-team-76!42
2026-01-09 12:24:20 +01:00
41353f2252
Logging for flow of the data exchange between client/server
2026-01-09 12:24:18 +01:00
Aysegul Aydinlik
809457254d
Merge branch 'CountringRecipeIngredients' into 'main'
...
added counting ingredients to serverside requirment of 4.3
Closes #51
See merge request cse1105/2025-2026/teams/csep-team-76!43
2026-01-09 12:24:04 +01:00
Rithvik Sriram
2d13a2b7af
rebased branches and fixed bugs
2026-01-08 23:19:50 +01:00
Rithvik Sriram
4dc44fb6e9
Implemented Optional fields and rewrote tests
2026-01-08 22:46:03 +01:00
Rithvik Sriram
01ff1a96a9
added comments
2026-01-08 22:45:36 +01:00
Rithvik Sriram
eb5aedbe91
added backend server search functionality with unit tests
...
# Conflicts:
# server/src/test/java/server/api/RecipeControllerTest.java
2026-01-08 22:45:27 +01:00
Aysegul
79e7b01363
fixed todo delete progatation in recipe
...
added count to IngredientController about what recipes we have or dont and 2 small typo mistakes
also added counting ingredients to IngredientService
the pipeline failure is bc i forgot tests exist
2026-01-08 22:20:54 +01:00
Aysegul
16c8d4c6dc
fixed todo delete progatation in recipe
...
added count to IngredientController about what recipes we have or dont and 2 small typo mistakes
also added counting ingredients to IngredientService
2026-01-08 22:06:45 +01:00
Mei Chang van der Werff
de8bdd60db
add agenda for week 7
2026-01-08 19:20:10 +01:00
Oskar Rasieński
6010208e33
Merge branch 'refactor/server-refactor' into 'main'
...
refactor/server
Closes #44
See merge request cse1105/2025-2026/teams/csep-team-76!41
2026-01-08 02:38:00 +01:00
Oskar Rasieński
64dd5e4a28
Changed SomeController to be a health check
2026-01-08 01:49:21 +01:00
Oskar Rasieński
04f58c22cc
Refactored IngredientController to use services.
2026-01-08 01:43:56 +01:00
Oskar Rasieński
707f88b70b
Fixed ordering in ingredient service.
2026-01-08 01:43:18 +01:00
Oskar Rasieński
e9b6d81a27
Refactored recipe controller to use services
2026-01-08 01:05:36 +01:00
Oskar Rasieński
0050671944
Moved services
2026-01-08 01:04:05 +01:00
Oskar Rasieński
b7116a0882
Created IngredientService
2026-01-07 23:49:42 +01:00
Oskar Rasieński
032b86e502
created getters for Ingredient
2026-01-07 23:46:57 +01:00
Oskar Rasieński
d56b07f2aa
comment and access fixes for RecipeService
2026-01-07 23:46:40 +01:00
Oskar Rasieński
299385c7b1
Created recipe service.
2026-01-07 23:23:20 +01:00
b01d313c9a
Merge branch 'client/incremental-websocket-modelling' into 'main'
...
fix(client/ws): Detailed WebSocket modelling
Closes #31
See merge request cse1105/2025-2026/teams/csep-team-76!39
2026-01-07 11:35:31 +01:00
ef65f33b64
chore(client): use lambda arg
2026-01-06 21:45:29 +01:00
ed87f1c09f
fix(client/print): remove obsolete code & +notimplexception
2026-01-06 21:41:01 +01:00
0cc767d577
fix(client/main): fixed FIXME(1) edit box rendering
2026-01-06 21:36:40 +01:00
9f892e8fb1
refactor(client/ws): divorce WS data handler from the class constructor
2026-01-06 21:32:07 +01:00
ae05675e27
Merge branch 'client/fix-idea-debugging' into 'main'
...
Fix JavaFX dependencies not working in IDEA Run/Debug configuration
See merge request cse1105/2025-2026/teams/csep-team-76!40
2026-01-06 18:25:23 +01:00
6d56e684a3
fix(client): separate Main and UI for IDEA debugger to work
...
Reference: https://www.reddit.com/r/JavaFX/wiki/common-problems/#wiki_how_do_i_fix_.27error.3A_javafx_runtime_components_are_missing.27.3F
2026-01-06 18:10:51 +01:00
5de11428a8
chore(client): cleanup
2026-01-06 18:07:09 +01:00
042a43e06a
feat(client/ws): integrate changes from main and create client-side WS service
2026-01-06 18:06:40 +01:00
9f67800372
Merge branch 'commons/recipe-model-v2' into 'main'
...
refactor: New recipe & ingredients model to work with (in)formal quantities
Closes #43
See merge request cse1105/2025-2026/teams/csep-team-76!38
2026-01-05 17:38:23 +01:00
