Aysegul Aydinlik
|
c07bae8d74
|
Merge branch 'favouriteMessage' into 'main'
Created a message for favourite Recipe
Closes #23
See merge request cse1105/2025-2026/teams/csep-team-76!30
|
2025-12-19 18:30:35 +01:00 |
|
Aysegul Aydinlik
|
3b53dd8ec6
|
Merge branch 'client/nutrition-view' into 'main'
feat: init ui definition nutrition view
Closes #9
See merge request cse1105/2025-2026/teams/csep-team-76!23
|
2025-12-19 18:29:40 +01:00 |
|
Mei Chang van der Werff
|
b0272fd276
|
Merge branch 'removeExampleCode' into 'main'
Removed all left over example code
Closes #27
See merge request cse1105/2025-2026/teams/csep-team-76!28
|
2025-12-19 00:48:19 +01:00 |
|
Rithvik Sriram
|
5feab76d94
|
Edit agenda-05.md
|
2025-12-18 20:44:14 +01:00 |
|
Aysegul Aydinlik
|
118aaef93a
|
Merge branch 'client-support-for-favourite' into 'main'
added client side recipe favouriting
See merge request cse1105/2025-2026/teams/csep-team-76!31
|
2025-12-18 19:31:18 +01:00 |
|
Oskar Rasieński
|
60efdc3a78
|
Merge branch 'feature/ws-client' into 'main'
Feature/ws-client
See merge request cse1105/2025-2026/teams/csep-team-76!25
|
2025-12-18 18:15:01 +01:00 |
|
Maria Dumitrescu
|
cf8d4096e7
|
feedback w6
|
2025-12-18 16:31:41 +01:00 |
|
Mei Chang van der Werff
|
3e47fdbb96
|
big Long instead of small long
|
2025-12-18 14:36:04 +01:00 |
|
Rithvik Sriram
|
6d66304bf3
|
Edit agenda-05.md
|
2025-12-18 14:32:04 +01:00 |
|
Rithvik Sriram
|
7f82d81b8c
|
Edit agenda-05.md
|
2025-12-18 14:27:02 +01:00 |
|
Aysegul Aydinlik
|
d752dfbec0
|
added client side recipe favouriting
|
2025-12-18 13:25:20 +01:00 |
|
Rithvik Sriram
|
65a7b0291a
|
Upload New File
|
2025-12-18 12:26:23 +01:00 |
|
Mei Chang van der Werff
|
a45f31abed
|
Removed all left over example code
|
2025-12-18 03:44:01 +01:00 |
|
Mei Chang van der Werff
|
a5ec17e486
|
created FavouriteRecipeMessage class
|
2025-12-18 03:25:12 +01:00 |
|
Aysegul Aydinlik
|
397bbedd9f
|
Merge branch 'quickfixforconfigissue' into 'main'
fixed 2 checkstyle errors and ConfigServiceTest.java issue
See merge request cse1105/2025-2026/teams/csep-team-76!27
|
2025-12-18 03:00:11 +01:00 |
|
Aysegul Aydinlik
|
1f545d3a63
|
fixed 2 checkstyle errors and ConfigServiceTest.java issue
|
2025-12-18 02:02:51 +01:00 |
|
|
|
19ebad93e8
|
Merge branch 'lenient-checkstyle' into 'main'
fix: A More Chill CheckStyle
Closes #15 and #17
See merge request cse1105/2025-2026/teams/csep-team-76!20
|
2025-12-17 22:21:15 +01:00 |
|
Mei Chang van der Werff
|
5d30a8eac1
|
Merge branch 'enumUnit' into 'main'
make the Unit Class enums
Closes #22
See merge request cse1105/2025-2026/teams/csep-team-76!24
|
2025-12-17 17:44:55 +01:00 |
|
Oskar Rasieński
|
8bceffa67c
|
Implemented websockets in foodpal ctrl.
|
2025-12-17 16:50:30 +01:00 |
|
Oskar Rasieński
|
3da89c386b
|
Created utils for websockets.
|
2025-12-17 16:26:27 +01:00 |
|
Oskar Rasieński
|
e41dc70f97
|
Modified Message and its subclasses to work nicely with jackson
|
2025-12-17 16:19:33 +01:00 |
|
Mei Chang van der Werff
|
a83885745c
|
make the Unit Class enums
|
2025-12-17 15:35:14 +01:00 |
|
|
|
3301c75354
|
feat: init ui definition nutrition view
|
2025-12-17 15:07:43 +01:00 |
|
Oskar Rasieński
|
f5eed945a2
|
Merge branch 'bugfix/new-recipe-selection' into 'main'
Bugfix/new recipe selection
Closes #21 and #19
See merge request cse1105/2025-2026/teams/csep-team-76!22
|
2025-12-17 13:44:52 +01:00 |
|
Oskar Rasieński
|
0dca957e43
|
Fixed bug and improved debug print
|
2025-12-17 13:32:14 +01:00 |
|
|
|
ca1d7ab872
|
Merge branch 'feature/client_navigation' into 'main'
Feature/client navigation
See merge request cse1105/2025-2026/teams/csep-team-76!15
|
2025-12-17 13:17:07 +01:00 |
|
|
|
ea840f032e
|
chore: add periods to all sentences.
|
2025-12-07 21:17:49 +01:00 |
|
|
|
6d2a180fa2
|
feat: new rule to check javadoc comments
|
2025-12-07 21:17:33 +01:00 |
|
|
|
4c372fbdff
|
fix: MagicNumber check disabled in tests
|
2025-12-07 21:17:02 +01:00 |
|
Natalia Cholewa
|
f9d4901b6c
|
Merge branch 'feature/ingredient-api' into 'main'
Ingredient controller and tests
See merge request cse1105/2025-2026/teams/csep-team-76!17
|
2025-12-06 14:16:17 +01:00 |
|
Maria Dumitrescu
|
68600b4222
|
feedback w4
|
2025-12-06 12:26:53 +01:00 |
|
Rithvik Sriram
|
fc211473ba
|
Edit agenda-04.md
|
2025-12-05 23:24:38 +01:00 |
|
Natalia Cholewa
|
566a46178f
|
chore: remove unnecessary dependency
|
2025-12-05 20:39:32 +01:00 |
|
|
|
11547778fa
|
Merge branch 'bugfix/solve-resource-file-path' into 'main'
fix: resolve issue with resource filepath
Closes #16
See merge request cse1105/2025-2026/teams/csep-team-76!18
|
2025-12-05 16:24:42 +01:00 |
|
|
|
4bb595dc6b
|
fix: resolve issue with resource filepath
|
2025-12-05 16:10:01 +01:00 |
|
Natalia Cholewa
|
6d5f7af225
|
fix: the 26 checkstyle violations in tests (Thank you checkstyle)
|
2025-12-05 14:47:30 +01:00 |
|
Natalia Cholewa
|
6b659a2ced
|
fix: formatting in ingredient controller
|
2025-12-05 14:40:12 +01:00 |
|
Natalia Cholewa
|
3af808ef58
|
feat: ingredient controller, websocket messages, ingredient controller tests
|
2025-12-05 14:38:43 +01:00 |
|
Rithvik Sriram
|
4414328fe0
|
changes from the reviewers implemented, some more error handling implemented with the load function of the show method
|
2025-12-05 14:12:05 +01:00 |
|
Rithvik Sriram
|
2cc702b8f8
|
Merge branch 'feature/client_config' into 'main'
Added Feature/client config
See merge request cse1105/2025-2026/teams/csep-team-76!8
|
2025-12-05 13:44:49 +01:00 |
|
|
|
6129fc2a5a
|
Merge branch 'feature/revised-client-ux-flow' into 'main'
feat: Revised UX flow for recipe details editing
Closes #13
See merge request cse1105/2025-2026/teams/csep-team-76!13
|
2025-12-05 12:56:06 +01:00 |
|
Natalia Cholewa
|
433f289c55
|
Merge branch 'feature/backend-websockets' into 'main'
Backend websockets
See merge request cse1105/2025-2026/teams/csep-team-76!16
|
2025-12-05 10:47:32 +01:00 |
|
Aysegul Aydinlik
|
cc75e42e8e
|
Merge branch 'BackendOfIngredients' into 'main'
backend stuff for ingredients and nutritions
See merge request cse1105/2025-2026/teams/csep-team-76!14
|
2025-12-05 00:46:03 +01:00 |
|
Aysegul Aydinlik
|
1c9ff190ea
|
backend stuff for ingredients and nutritions AND FIXED MAGIC NUMBERS and fixed stevens and oskarsss problems
|
2025-12-05 00:30:12 +01:00 |
|
Aysegul Aydinlik
|
f9262d4046
|
backend stuff for ingredients and nutritions AND FIXED MAGIC NUMBERS and fixed stevens and oskars problems
|
2025-12-05 00:12:53 +01:00 |
|
|
|
10868134b0
|
fix: autoselect cloned recipe after cloning operation
|
2025-12-04 23:11:16 +01:00 |
|
Natalia Cholewa
|
e85a43725d
|
fix: checkstyle violations
|
2025-12-04 23:08:10 +01:00 |
|
Natalia Cholewa
|
25fdbcf49e
|
fix: testing with websocket connection
|
2025-12-04 23:03:52 +01:00 |
|
Natalia Cholewa
|
cfacc37739
|
Merge remote-tracking branch 'origin/main' into feature/backend-websockets
|
2025-12-04 22:52:16 +01:00 |
|
Natalia Cholewa
|
8e24e47813
|
feat: topics, recipe messages
|
2025-12-04 22:52:14 +01:00 |
|
