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

Commit graph

  • 453e5b11bd fix: pipeline not passing origin/feature/client-recipe-i18n Natalia Cholewa 2026-01-09 23:49:10 +01:00
  • a95c5ac7d0 made tests that work in gitlab, without being skipped Mei Chang van der Werff 2026-01-09 23:44:43 +01:00
  • aacb8d97c8 added minutes of week 7 Aysegul 2026-01-09 23:40:35 +01:00
  • b130381154 feat: clientside language filter and recipe language selector Natalia Cholewa 2026-01-09 23:35:30 +01:00
  • 3c33f2ff35 Merge branch 'idkwhattonameitanymore' into 'main' Aysegul Aydinlik 2026-01-09 22:47:54 +01:00
  • 2224fe1f51 Merge branch 'feature/server-recipe-i18n' into 'main' Natalia Cholewa 2026-01-09 22:28:31 +01:00
  • fe4d3ff2d6 added pop up view ingredients + warnings for delete removed the star import should also fix the test issue Aysegul 2026-01-09 22:16:30 +01:00
  • bab9046682 added pop up view ingredients + warnings for delete removed the star import Aysegul 2026-01-09 21:50:30 +01:00
  • ec60b7b7d3 added pop up view ingredients + warnings for delete removed the star import Aysegul 2026-01-09 21:47:10 +01:00
  • 9aae8f918f added pop up view ingredients + warnings for delete Aysegul 2026-01-09 21:42:57 +01:00
  • 07adedde3e Merge branch 'feature/server_search_bar' into 'main' Steven Liu 2026-01-09 16:35:02 +01:00
  • 97774cf709 fix: tests didn't compile oops Natalia Cholewa 2026-01-09 16:34:42 +01:00
  • a7d9fcb37b style(client): align ingredient and step list widths origin/fix/ingredient-step-list-sizing Rithvik Sriram 2026-01-09 16:33:01 +01:00
  • ec5881790d updated Provisionary tasks for agenda-7.md Mei Chang van der Werff 2026-01-09 15:38:47 +01:00
  • 95213519a3
         chore(gitignore): add trace.db and config.json to ignore-list Steven Liu 2026-01-09 15:11:58 +01:00
  • 74b6f25e24 feat: language in recipes Natalia Cholewa 2026-01-09 14:54:42 +01:00
  • 7d7158b121
         fix(client/ui): silently fail ingredient input if any is null origin/bugfix/null-amount-name Steven Liu 2026-01-09 14:09:15 +01:00
  • caa78515cf Merge branch 'main' into 'feature/server_search_bar' Rithvik Sriram 2026-01-09 13:49:51 +01:00
  • 1c9ffb9d13 Merge branch 'etc/logging' into 'main' Steven Liu 2026-01-09 12:24:20 +01:00
  • 41353f2252 Logging for flow of the data exchange between client/server Steven Liu 2026-01-09 12:24:18 +01:00
  • 809457254d Merge branch 'CountringRecipeIngredients' into 'main' Aysegul Aydinlik 2026-01-09 12:24:04 +01:00
  • 2d13a2b7af rebased branches and fixed bugs origin/feature/server_search_bar Rithvik Sriram 2026-01-08 23:19:50 +01:00
  • 4dc44fb6e9 Implemented Optional fields and rewrote tests Rithvik Sriram 2026-01-08 22:38:52 +01:00
  • 01ff1a96a9 added comments Rithvik Sriram 2025-12-19 13:25:03 +01:00
  • eb5aedbe91 added backend server search functionality with unit tests Rithvik Sriram 2025-12-19 13:12:18 +01:00
  • 79e7b01363 fixed todo delete progatation in recipe Aysegul 2026-01-08 22:20:54 +01:00
  • 16c8d4c6dc fixed todo delete progatation in recipe Aysegul 2026-01-08 22:06:45 +01:00
  • de8bdd60db add agenda for week 7 origin/backup-DeleteIngredientPrevention origin/DeleteIngredientPrevention Mei Chang van der Werff 2026-01-08 19:20:10 +01:00
  • 9787584d97
         feat(server/logging): endpoint calls logging origin/etc/logging Steven Liu 2026-01-08 16:33:19 +01:00
  • 841fe75fad
         chore(commons/logging): descriptive toString for models Steven Liu 2026-01-08 16:33:08 +01:00
  • e91d6355f0
         feat(client/logging): client-side info logging Steven Liu 2026-01-08 16:32:59 +01:00
  • 0cd1a00c98
         chore(logging): add slf4j and JUL bridge deps Steven Liu 2026-01-08 16:06:54 +01:00
  • 6010208e33 Merge branch 'refactor/server-refactor' into 'main' Oskar Rasieński 2026-01-08 02:38:00 +01:00
  • 64dd5e4a28 Changed SomeController to be a health check Oskar Rasieński 2026-01-08 01:49:21 +01:00
  • 04f58c22cc Refactored IngredientController to use services. Oskar Rasieński 2026-01-08 01:43:56 +01:00
  • 707f88b70b Fixed ordering in ingredient service. Oskar Rasieński 2026-01-08 01:43:18 +01:00
  • e9b6d81a27 Refactored recipe controller to use services Oskar Rasieński 2026-01-08 01:05:36 +01:00
  • 0050671944 Moved services Oskar Rasieński 2026-01-08 01:04:05 +01:00
  • b7116a0882 Created IngredientService Oskar Rasieński 2026-01-07 23:49:42 +01:00
  • 032b86e502 created getters for Ingredient Oskar Rasieński 2026-01-07 23:46:57 +01:00
  • d56b07f2aa comment and access fixes for RecipeService Oskar Rasieński 2026-01-07 23:46:40 +01:00
  • 299385c7b1 Created recipe service. Oskar Rasieński 2026-01-07 23:23:20 +01:00
  • b01d313c9a Merge branch 'client/incremental-websocket-modelling' into 'main' Steven Liu 2026-01-07 11:35:31 +01:00
  • ef65f33b64
         chore(client): use lambda arg Steven Liu 2026-01-06 21:45:29 +01:00
  • ed87f1c09f
         fix(client/print): remove obsolete code & +notimplexception Steven Liu 2026-01-06 21:41:01 +01:00
  • 0cc767d577
         fix(client/main): fixed FIXME(1) edit box rendering Steven Liu 2026-01-06 21:36:40 +01:00
  • 9f892e8fb1
         refactor(client/ws): divorce WS data handler from the class constructor Steven Liu 2026-01-06 21:32:07 +01:00
  • ae05675e27 Merge branch 'client/fix-idea-debugging' into 'main' Steven Liu 2026-01-06 18:25:23 +01:00
  • 6d56e684a3
         fix(client): separate Main and UI for IDEA debugger to work Steven Liu 2026-01-06 18:10:51 +01:00
  • 5de11428a8
         chore(client): cleanup Steven Liu 2026-01-06 18:07:09 +01:00
  • 042a43e06a
         feat(client/ws): integrate changes from main and create client-side WS service Steven Liu 2026-01-06 18:06:40 +01:00
  • 9f67800372 Merge branch 'commons/recipe-model-v2' into 'main' Steven Liu 2026-01-05 17:38:23 +01:00
  • 253da0b5bc chore(test/printExport): delegate creation to DefaultValueFactory Steven Liu 2026-01-05 17:20:25 +01:00
  • 39b2bb9d61 fix(commons/scaling): delegate scaleBy(int) to scaleBy(double) impl Steven Liu 2026-01-05 17:14:28 +01:00
  • b60284fa14 fix(client/serverUtils): immigrate nulling IDs to addRecipe(Recipe) Steven Liu 2026-01-05 17:07:04 +01:00
  • 7bb2b06679 fix(test/unit): fix tests for cup(s) Steven Liu 2026-01-05 17:00:49 +01:00
  • 62bd134084 feat(unit): kindly make some cup(s) Steven Liu 2026-01-05 16:58:19 +01:00
  • 33a542672f fix(test/client): implement pipeline testing skip in teardown function Steven Liu 2025-12-29 14:08:51 +01:00
  • 88ef77d858 refactor(test/server): refactor server-side testing Steven Liu 2025-12-29 14:02:52 +01:00
  • c0add049be refactor(test/client): refactor client-side tests Steven Liu 2025-12-29 14:02:24 +01:00
  • 73c42303c4 refactor(test/commons): refactor tests for commons models Steven Liu 2025-12-29 14:02:08 +01:00
  • 554d769305 chore(commons): implement missing equals/hashcode Steven Liu 2025-12-29 14:01:44 +01:00
  • 71bb6d03ed fix(client): server utils setting related IDs to null Steven Liu 2025-12-29 14:00:06 +01:00
  • d497ed108e fix(server): fix duplicate Ingredient present in each recipe Steven Liu 2025-12-29 12:55:00 +01:00
  • 2d1df8fc11 feat(commons): create new Scalable<T extends RecipeIngredient> interface Steven Liu 2025-12-29 12:51:32 +01:00
  • b77f4aee76 fix(client): fixed some issues on the client-side Steven Liu 2025-12-29 12:49:23 +01:00
  • 04a999147c refactor(server): server-side integration of new recipe modelling Steven Liu 2025-12-22 03:01:10 +02:00
  • f04bbc037e refactor(client): client-side refactor to new modelling Steven Liu 2025-12-22 03:00:22 +02:00
  • 88a85f2e04 refactor: revised class layout for JPA entities Steven Liu 2025-12-22 02:58:50 +02:00
  • 9958ae5fbe Merge branch 'client/ingredient-input-v2' into 'main' Steven Liu 2026-01-05 16:33:28 +01:00
  • 560a00cd2a Merge branch 'refactor/recipe-details' into 'main' Steven Liu 2026-01-05 16:22:08 +01:00
  • ee66b643ec refactor: make callbacks clean Natalia Cholewa 2026-01-05 16:05:27 +01:00
  • 6ca38e6613
         chore: correct wrong reference to super in commitEdit calls Steven Liu 2025-12-22 00:21:16 +02:00
  • e4fc67e816
         refactor: make ingredient input cells capable of informal & formal inputs Steven Liu 2025-12-21 23:41:48 +02:00
  • d2ad5337b9 refactor: put recipe detail controller into its own file, don't use guice for injecting fxml controllers Natalia Cholewa 2025-12-20 22:53:00 +01:00
  • 16482a7017 Merge branch 'highlight-list-view' into 'main' Natalia Cholewa 2025-12-20 18:51:46 +01:00
  • 086b8539c3 added highlighting fav recipes + list Aysegul Aydinlik 2025-12-19 21:19:24 +01:00
  • 2566eb450f
         chore: update gitignore - prevent accidentally committing client config Steven Liu 2025-12-20 01:07:31 +02:00
  • 625982dcd2 Merge branch 'feature/client-side-search' into 'main' Natalia Cholewa 2025-12-19 23:49:03 +01:00
  • 96eb19d74c merge main into feature/client-side-search Natalia Cholewa 2025-12-19 23:43:39 +01:00
  • dee91f9245
         fix: add period to PrintExportService as MR written before new checkstyle Steven Liu 2025-12-20 00:31:44 +02:00
  • 4fc4ca7327 Merge branch 'feature/client_printExport' into 'main' Steven Liu 2025-12-19 23:28:49 +01:00
  • 5db8721148 Merge branch 'client/lang-button-dropdown' into 'main' Steven Liu 2025-12-19 22:57:31 +01:00
  • 00e4bb03f4
         refactor: newest delivery from main Steven Liu 2025-12-19 23:54:45 +02:00
  • c56344d88a Merge branch 'RecipeIngredientTest' into 'main' Mei Chang van der Werff 2025-12-19 22:34:41 +01:00
  • ca7c5cbfb9
         fix(logic): immigrates LangSelectMenu to own controller Steven Liu 2025-12-19 23:29:27 +02:00
  • 7e69976e5e
         feat: controller for language list control Steven Liu 2025-12-16 13:09:03 +01:00
  • 6b0d728ad3
         chore: acquired flag images of langs Steven Liu 2025-12-16 13:07:32 +01:00
  • f7ff7497a2
         feat: lang button into combo box Steven Liu 2025-12-16 13:07:15 +01:00
  • 6c7a9434ca
         chore: create display texts for langs Steven Liu 2025-12-16 13:06:45 +01:00
  • bb5e4a85a4 minutes for meeting week 6 Mei Chang van der Werff 2025-12-19 21:37:15 +01:00
  • d802d8627e fix: checkstyle violations Natalia Cholewa 2025-12-19 20:16:21 +01:00
  • 4b28d073b9 Merge branch 'main' into 'feature/client-side-search' Natalia Cholewa 2025-12-19 20:12:51 +01:00
  • 3c45143d76 feat: client side search box Natalia Cholewa 2025-12-19 19:59:29 +01:00
  • 96eff80653 Merge branch 'favourite-button-ui' into 'main' Aysegul Aydinlik 2025-12-19 20:03:21 +01:00
  • 7a58153cd6 added a star for favouriting a recipe and also unfavouriting it Aysegul Aydinlik 2025-12-18 19:38:26 +01:00
  • c07bae8d74 Merge branch 'favouriteMessage' into 'main' Aysegul Aydinlik 2025-12-19 18:30:35 +01:00
  • 3b53dd8ec6 Merge branch 'client/nutrition-view' into 'main' Aysegul Aydinlik 2025-12-19 18:29:40 +01:00
  • b0272fd276 Merge branch 'removeExampleCode' into 'main' Mei Chang van der Werff 2025-12-19 00:48:19 +01:00
  • 5feab76d94 Edit agenda-05.md Rithvik Sriram 2025-12-18 20:44:14 +01:00