steven/csep-2025
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Commit graph

  • 118aaef93a Merge branch 'client-support-for-favourite' into 'main' Aysegul Aydinlik 2025-12-18 19:31:18 +01:00
  • 60efdc3a78 Merge branch 'feature/ws-client' into 'main' Oskar Rasieński 2025-12-18 18:15:01 +01:00
  • cf8d4096e7 feedback w6 Maria Dumitrescu 2025-12-18 16:31:41 +01:00
  • 3e47fdbb96 big Long instead of small long Mei Chang van der Werff 2025-12-18 14:36:04 +01:00
  • 6d66304bf3 Edit agenda-05.md Rithvik Sriram 2025-12-18 14:32:04 +01:00
  • 7f82d81b8c Edit agenda-05.md Rithvik Sriram 2025-12-18 14:27:02 +01:00
  • d752dfbec0 added client side recipe favouriting Aysegul Aydinlik 2025-12-18 13:25:20 +01:00
  • 65a7b0291a Upload New File Rithvik Sriram 2025-12-18 12:26:23 +01:00
  • b553cee6fd fix checkstyle error Mei Chang van der Werff 2025-12-18 04:27:04 +01:00
  • 6794efa3a6 tested all units conversion and made every unit type a field Mei Chang van der Werff 2025-12-18 04:25:42 +01:00
  • a45f31abed Removed all left over example code Mei Chang van der Werff 2025-12-18 03:44:01 +01:00
  • fef20ec876 refactor to setters TODO, ingredientController Mei Chang van der Werff 2025-12-18 03:35:47 +01:00
  • a5ec17e486 created FavouriteRecipeMessage class Mei Chang van der Werff 2025-12-18 03:25:12 +01:00
  • 4a902ead20 ConvertToBaseUnit test + code fix Mei Chang van der Werff 2025-12-18 00:54:44 +01:00
  • 87f8a883d5 getUnit() tests Mei Chang van der Werff 2025-12-17 14:52:40 +01:00
  • 397bbedd9f Merge branch 'quickfixforconfigissue' into 'main' Aysegul Aydinlik 2025-12-18 03:00:11 +01:00
  • 1f545d3a63 fixed 2 checkstyle errors and ConfigServiceTest.java issue Aysegul Aydinlik 2025-12-18 02:02:51 +01:00
  • 19ebad93e8 Merge branch 'lenient-checkstyle' into 'main' Steven Liu 2025-12-17 22:21:15 +01:00
  • 5d30a8eac1 Merge branch 'enumUnit' into 'main' Mei Chang van der Werff 2025-12-17 17:44:55 +01:00
  • 8bceffa67c Implemented websockets in foodpal ctrl. Oskar Rasieński 2025-12-17 16:50:30 +01:00
  • 3da89c386b Created utils for websockets. Oskar Rasieński 2025-12-17 16:26:27 +01:00
  • e41dc70f97 Modified Message and its subclasses to work nicely with jackson Oskar Rasieński 2025-12-17 16:19:33 +01:00
  • a83885745c make the Unit Class enums Mei Chang van der Werff 2025-12-17 15:35:14 +01:00
  • 3301c75354
         feat: init ui definition nutrition view Steven Liu 2025-12-16 13:24:11 +01:00
  • f5eed945a2 Merge branch 'bugfix/new-recipe-selection' into 'main' Oskar Rasieński 2025-12-17 13:44:52 +01:00
  • 0dca957e43 Fixed bug and improved debug print Oskar Rasieński 2025-12-17 13:32:14 +01:00
  • ca1d7ab872 Merge branch 'feature/client_navigation' into 'main' Steven Liu 2025-12-17 13:17:07 +01:00
  • ea840f032e
         chore: add periods to all sentences. Steven Liu 2025-12-07 21:17:49 +01:00
  • 6d2a180fa2
         feat: new rule to check javadoc comments Steven Liu 2025-12-07 21:17:33 +01:00
  • 4c372fbdff
         fix: MagicNumber check disabled in tests Steven Liu 2025-12-07 21:17:02 +01:00
  • f9d4901b6c Merge branch 'feature/ingredient-api' into 'main' Natalia Cholewa 2025-12-06 14:16:17 +01:00
  • 68600b4222 feedback w4 Maria Dumitrescu 2025-12-06 12:26:53 +01:00
  • fc211473ba Edit agenda-04.md Rithvik Sriram 2025-12-05 23:24:38 +01:00
  • 566a46178f chore: remove unnecessary dependency Natalia Cholewa 2025-12-05 20:39:32 +01:00
  • 11547778fa Merge branch 'bugfix/solve-resource-file-path' into 'main' Steven Liu 2025-12-05 16:24:42 +01:00
  • 4bb595dc6b
         fix: resolve issue with resource filepath Steven Liu 2025-12-05 16:10:01 +01:00
  • b38e0e7482 fixed all pipeline errors Rithvik Sriram 2025-12-05 15:27:53 +01:00
  • 2339d70499 Merge branch 'feature/client_navigation' into feature/client_printExport Rithvik Sriram 2025-12-05 15:22:05 +01:00
  • 7d32799f13 Print export Unit tests are written Rithvik Sriram 2025-12-05 15:21:19 +01:00
  • 6d5f7af225 fix: the 26 checkstyle violations in tests (Thank you checkstyle) Natalia Cholewa 2025-12-05 14:47:30 +01:00
  • 6b659a2ced fix: formatting in ingredient controller Natalia Cholewa 2025-12-05 14:40:12 +01:00
  • 3af808ef58 feat: ingredient controller, websocket messages, ingredient controller tests Natalia Cholewa 2025-12-05 14:38:43 +01:00
  • 4414328fe0 changes from the reviewers implemented, some more error handling implemented with the load function of the show method Rithvik Sriram 2025-12-05 14:12:05 +01:00
  • 91fbefb392 Basic print functionality done with comments Rithvik Sriram 2025-12-05 13:54:56 +01:00
  • 2cc702b8f8 Merge branch 'feature/client_config' into 'main' Rithvik Sriram 2025-12-05 13:44:49 +01:00
  • 6129fc2a5a Merge branch 'feature/revised-client-ux-flow' into 'main' Steven Liu 2025-12-05 12:56:06 +01:00
  • 433f289c55 Merge branch 'feature/backend-websockets' into 'main' Natalia Cholewa 2025-12-05 10:47:32 +01:00
  • cc75e42e8e Merge branch 'BackendOfIngredients' into 'main' Aysegul Aydinlik 2025-12-05 00:46:03 +01:00
  • 1c9ff190ea backend stuff for ingredients and nutritions AND FIXED MAGIC NUMBERS and fixed stevens and oskarsss problems Aysegul Aydinlik 2025-12-05 00:30:12 +01:00
  • f9262d4046 backend stuff for ingredients and nutritions AND FIXED MAGIC NUMBERS and fixed stevens and oskars problems Aysegul Aydinlik 2025-12-05 00:12:53 +01:00
  • 10868134b0
         fix: autoselect cloned recipe after cloning operation Steven Liu 2025-12-04 23:11:16 +01:00
  • e85a43725d fix: checkstyle violations Natalia Cholewa 2025-12-04 23:08:10 +01:00
  • 25fdbcf49e fix: testing with websocket connection Natalia Cholewa 2025-12-04 23:03:52 +01:00
  • cfacc37739 Merge remote-tracking branch 'origin/main' into feature/backend-websockets Natalia Cholewa 2025-12-04 22:52:16 +01:00
  • 8e24e47813 feat: topics, recipe messages Natalia Cholewa 2025-12-04 22:52:14 +01:00
  • 0bfff2719e fundamental print logic implemented Rithvik Sriram 2025-12-04 22:37:45 +01:00
  • 409877a6fb
         chore: a farewell to Add* UI elements Steven Liu 2025-12-04 22:20:54 +01:00
  • c2fa31aa9f
         fix: no null pointer exceptions if the user can't see anything :) Steven Liu 2025-12-04 22:13:22 +01:00
  • 603de94870
         feat: bold font recipe name + i18n for controllers Steven Liu 2025-12-04 22:08:39 +01:00
  • 5dd6c89f73
         feat: extract abstract OrderedEditableListCell<T> Steven Liu 2025-12-04 21:39:55 +01:00
  • 40d157cc6c
         fix: remove LocaleAware constraint from MainCtrl Steven Liu 2025-12-04 21:09:12 +01:00
  • d57d7a25bd agenda week 4 Oskar Rasieński 2025-12-04 19:29:32 +01:00
  • 69ae19711b Code handling navigation done by a navigation class with one method Rithvik Sriram 2025-12-04 19:12:31 +01:00
  • 79b3c0a967 Merge branch 'feature/client_config' into feature/client_navigation pulling in checkstyle to unblock CI Rithvik Sriram 2025-12-04 18:55:11 +01:00
  • ccb72481fd
         feat: resolve TODO autofocus edit box Steven Liu 2025-12-04 18:22:26 +01:00
  • 30cbfbc454
         fix: rectify a NPE caused by wrong ListView model Steven Liu 2025-12-04 18:22:10 +01:00
  • 73324022b0
         chore: cleanup debug sout (oops) Steven Liu 2025-12-04 18:21:02 +01:00
  • 1ad959b238 fixed pipeline issues Rithvik Sriram 2025-12-04 18:09:30 +01:00
  • 8747537901
         chore: purge dead weight code Steven Liu 2025-12-04 17:46:52 +01:00
  • 0bec62b9a3
         feat: integrate steps list updates Steven Liu 2025-12-04 17:46:38 +01:00
  • 2ce855aa3d
         feat: integrate ingredient list updates Steven Liu 2025-12-04 17:31:34 +01:00
  • 26483e6d13 Added all suggested changes from the comments by reviewers Rithvik Sriram 2025-12-04 17:28:02 +01:00
  • 244ec5ee10 Fixed all changes from comments from merge Rithvik Sriram 2025-12-04 17:07:48 +01:00
  • bc3744aee5
         fix: use proper ServerUtils for the availability check Steven Liu 2025-12-04 17:00:49 +01:00
  • 7d2cadc800
         refactor: integrate remote main changes (locale) Steven Liu 2025-12-04 16:56:07 +01:00
  • 78e7f90024 backend stuff for ingredients and nutritions AND FIXED MAGIC NUMBERS Aysegul Aydinlik 2025-12-04 15:41:43 +01:00
  • be82031c1e Merge branch 'feature/locale' into 'main' Oskar Rasieński 2025-12-04 14:43:33 +01:00
  • 88dc43613f backend stuff for ingredients and nutritions Aysegul Aydinlik 2025-12-04 14:41:45 +01:00
  • 342c10bcdb added @override to initializeComponents Oskar Rasieński 2025-12-04 14:39:53 +01:00
  • c0be17e0b0 overengineered locale switch Oskar Rasieński 2025-12-04 14:36:00 +01:00
  • 2c75567a7d changed default title names Oskar Rasieński 2025-12-04 14:26:51 +01:00
  • d42e6ff74c
         feat: new UX for add/edit/update recipes Steven Liu 2025-12-04 13:34:28 +01:00
  • 805c8fd6ea
         feat: refactor the element tree to make inline recipe name change possible Steven Liu 2025-12-04 13:32:32 +01:00
  • c7b651e266 fixed errors with detailed view on deletions and edits Oskar Rasieński 2025-12-04 02:14:48 +01:00
  • f9db7cf370 removed non existing button Oskar Rasieński 2025-12-04 01:41:27 +01:00
  • d0a61aadd8 small fixes Oskar Rasieński 2025-12-04 01:41:01 +01:00
  • ebd896cbee All locale should work now Oskar Rasieński 2025-12-04 01:37:32 +01:00
  • 91c8469282 Everything except window titles works with resource bundles Oskar Rasieński 2025-12-04 01:15:27 +01:00
  • c53239d71e AddName, AddIngredient and AddStep all work with localization Oskar Rasieński 2025-12-04 00:26:33 +01:00
  • 6e9ac2b055 Added base locale functionality. Works in AddNameCtrl for now. Oskar Rasieński 2025-12-04 00:00:38 +01:00
  • fc13f7b847 Merge branch 'workingButtons' into 'main' Natalia Cholewa 2025-12-03 21:09:04 +01:00
  • 29278c2fc1 removing example code Mei Chang van der Werff 2025-12-02 18:46:38 +01:00
  • ca00ee8e79 star import checkstyle error fix Mei Chang van der Werff 2025-12-02 18:20:47 +01:00
  • 517984a9f5 Some checkstyle fixes Mei Chang van der Werff 2025-12-02 18:07:45 +01:00
  • 0525885979 Cloneing recipes is possible Mei Chang van der Werff 2025-12-02 18:03:42 +01:00
  • 1414393aad Adding preparation steps is possible, but no automatically refresh Mei Chang van der Werff 2025-12-02 17:52:11 +01:00
  • 717684e159 Updating recipes instead of making a new recipe, when adding ingredients Mei Chang van der Werff 2025-12-02 16:50:20 +01:00
  • f93cf8f0aa Adding ingredients is possible, but no automatically refresh Mei Chang van der Werff 2025-12-02 16:25:19 +01:00
  • 236718fa6e Naming recipes on a different scene Mei Chang van der Werff 2025-12-02 13:08:23 +01:00
  • 1c8f5780d9 Show foodpalApplication when running Mei Chang van der Werff 2025-12-01 15:39:01 +01:00