Commit Graph

Select branches

Hide Pull Requests

backend-tobuy-adddish

backend-tobuy-stable

dev-backend

dev-backend-stocks

dev-backend-stuffs

dev-backend-tobuy

dev-frontend-add_dishes

dev-frontend-stock

dev-frontend-top

dev-frontend-with-api

dev-frontend-在庫登録

develop

develop-backend

develop-banckend-test

develop-frontend

develop-frontend-recipe-api

feature-addByRecipeOption

feature-backend-add-springdocs

feature-backend-datainit

feature-backend-localfwd

feature-backend-recipe

feature-backend-stock-fix

feature-backend-stock-service

feature-backend-stuff

feature-backend-tobuy-addByRecipe

feature-backend-tobuy-amount-fix

feature-backend-tobuy-buy

feature-backend-tobuy-history

feature-backend-tobuy-stock

feature-backend-tobuy-stock-2

feature-backend-tobuy-stock-zhang

feature-backend-zhang

feature-dishuiandcolor

feature-frontend-adddishes-logic

feature-frontend-alert

feature-frontend-ama

feature-frontend-bug-fix

feature-frontend-bug-fixes

feature-frontend-dateselect-fix

feature-frontend-design-fix

feature-frontend-dishedit

feature-frontend-dishedit-kato

feature-frontend-expdate-optional

feature-frontend-hotfix-testicon

feature-frontend-lei

feature-frontend-recipe-api

feature-frontend-recipe-fix

feature-frontend-register

feature-frontend-stock

feature-frontend-stock-fix

feature-frontend-stock-suzuki

feature-frontend-stock-suzuki-ver2

feature-frontend-stock-suzuki-ver3

feature-frontend-styles

feature-frontend-tobuy-error

feature-frontend-tobuydialog

feature-frontend-top

feature_frontend_addDishes

feature_frontend_dishList_ui

feature_frontend_dishlist

main

release/sprint1

release/sprint2

release/sprint3

Mono Color

• 34d2487df8 在庫追加のカレンダー修正 akito.nishiwaki 2025-06-13 11:47:24 +0900
• 54b9539c0f レシピ追加時のエラーメッセージを表示 feature-frontend-recipe-fix Masaharu.Kato 2025-06-16 11:17:58 +0900
• 7900e7a0ed (review) stocksのコメントを修正しました zhang.pengcheng 2025-06-16 10:41:47 +0900
• 2779e85226 料理名を空欄にした時の不具合を修正 Masaharu.Kato 2025-06-16 10:52:04 +0900
• 208872fc31 (review) stocksのコメントを修正しました zhang.pengcheng 2025-06-16 10:41:47 +0900
• 4fa35de3ac 在庫追加のカレンダー修正 akito.nishiwaki 2025-06-13 11:47:24 +0900
• 9ae705a849 カレンダー日本時間で出力 akito.nishiwaki 2025-06-13 10:52:29 +0900
• 9775fa7fdf 入力欄の修正，購入日に今日の日付を設定 release/sprint2 feature-frontend-stock-fix Masaharu.Kato 2025-06-13 10:24:02 +0900
• fcf96bbf97 Merge branch 'develop-frontend' of https://ivis.backlog.com/git/TRAIN2025_GROUP_K/joint_exc into develop-frontend feature-frontend-stock Masaharu.Kato 2025-06-12 17:04:05 +0900
• 3555a69921 デザインの調整 Masaharu.Kato 2025-06-12 17:03:13 +0900
• dc98e34b3d Merge remote-tracking branch 'origin/develop-backend' into develop-frontend Masaharu.Kato 2025-06-12 17:02:56 +0900
• 1cb3a4fc55 カレンダーが見切れにように修正 Haru.Kusano 2025-06-12 16:57:52 +0900
• 3c3c284878 不具合修正 feature-frontend-dishedit-kato Masaharu.Kato 2025-06-12 16:26:37 +0900
• ff7723d97a Merge remote-tracking branch 'origin/develop-frontend' into feature-frontend-dishedit-kato Masaharu.Kato 2025-06-12 16:26:26 +0900
• 2bafdec9f6 Merge remote-tracking branch 'origin/develop-backend' into feature-frontend-ama feature-frontend-ama Amagasu 2025-06-12 16:08:59 +0900
• c3e8edeeac ToBuyRepository.findByUserIdOrderByTobuyIdAsc をｓ修正しました zhang.pengcheng 2025-06-12 16:04:30 +0900
• 7dc49cacdb 同じ名前の食材がある場合でもエラーにならないように修正 Masaharu.Kato 2025-06-12 16:03:44 +0900
• fb18965455 Merge remote-tracking branch 'origin/develop-backend' into feature-frontend-ama Amagasu 2025-06-12 15:54:30 +0900
• 4279750e3b 料理レシピが動くように修正 Masaharu.Kato 2025-06-12 15:52:21 +0900
• b8e7a4ed1d Merge remote-tracking branch 'origin/feature-frontend-dishedit' into feature-frontend-dishedit-kato Masaharu.Kato 2025-06-12 15:52:05 +0900
• 8a28c0ca40 削除ボタンで食材を削除してもキャンセルボタンで前のダイアログに戻ると削除前の食材がリストに表示されるように変更 feature-frontend-dishedit masato.fujita 2025-06-12 15:46:31 +0900
• 06fa43a174 Merge remote-tracking branch 'origin/develop-frontend' into feature-frontend-register akito.nishiwaki 2025-06-12 15:43:50 +0900
• 699a1770da Merge remote-tracking branch 'origin/develop-frontend' into feature-frontend-register akito.nishiwaki 2025-06-12 15:30:55 +0900
• 9ebe041a27 Merge remote-tracking branch 'origin/develop-frontend' into feature-frontend-stock Yuna.Suzuki 2025-06-12 15:24:24 +0900
• dc6ab8662f 料理リストにAPIの内容を表示 masato.fujita 2025-06-12 15:19:51 +0900
• 53789a2309 購入処理後ダイアログを閉じる Masaharu.Kato 2025-06-12 15:18:23 +0900
• 55b58e1f29 Merge remote-tracking branch 'origin/develop-backend' into feature-frontend-dishedit-kato Masaharu.Kato 2025-06-12 15:17:33 +0900
• 9a3b22d2e7 在庫の新規追加機能を実装しました Yuna.Suzuki 2025-06-12 15:12:12 +0900
• 75b055574f 料理追加・編集画面を実装 Masaharu.Kato 2025-06-12 14:58:09 +0900
• 2d6f5f173e カレンダー追加 akito.nishiwaki 2025-06-12 14:49:22 +0900
• 44c8660939 機能仕様書に合わせ Amagasu 2025-06-12 14:17:57 +0900
• ea6d738028 stock-add backend fixed Amagasu 2025-06-12 14:08:34 +0900
• 138df3084a Merge remote-tracking branch 'origin/feature-frontend-ama' into feature-frontend-dishedit masato.fujita 2025-06-12 13:04:54 +0900
• 3a864a4c96 個数ダイアログの追加 masato.fujita 2025-06-12 13:04:35 +0900
• e3ba1d5b49 1. recipesStuffsRepository → recipeStuffsRepository 既存のrecipeStuffsRepository.javaを削除したら、本来のrecipesStuffsRepositoryをrecipeStuffsRepositorに変わる 2. tobuy/addByRecipeを実装しました feature-backend-tobuy-addByRecipe zhang.pengcheng 2025-06-12 13:04:12 +0900
• 83a2718ca2 recipe initializable Amagasu 2025-06-12 13:02:43 +0900
• 8fd8771ac5 料理追加の画面内での機能まで実装 Masaharu.Kato 2025-06-12 11:59:30 +0900
• 48ed1c67dc Stockpageに追加ボタンを入れました Yuna.Suzuki 2025-06-12 11:53:45 +0900
• 9d5a87b303 Merge remote-tracking branch 'origin/develop-backend' into feature-frontend-dishedit masato.fujita 2025-06-12 09:51:58 +0900
• 5a85ea5dbc APIとの統合(不具合あり) masato.fujita 2025-06-12 09:51:17 +0900
• 1153f69d09 買うものリストの各種ダイアログをコンポーネント化 Masaharu.Kato 2025-06-11 17:34:48 +0900
• fed5a2e923 コメントを修正しました develop-banckend-test zhang.pengcheng 2025-06-11 17:19:51 +0900
• 9dea195615 買うものリストの削除確認ダイアログの作成 Haru.Kusano 2025-06-11 14:56:34 +0900
• a20c77b682 インポートの削除 feature_frontend_dishlist masato.fujita 2025-06-11 14:35:47 +0900
• a95bc2b19c Merge remote-tracking branch 'origin/feature-frontend-styles' into feature_frontend_dishlist masato.fujita 2025-06-11 14:31:53 +0900
• 2395739b9b エラーの修正 masato.fujita 2025-06-11 14:27:31 +0900
• 341af26a01 Merge remote-tracking branch 'origin/develop-frontend-recipe-api' into feature_frontend_dishlist masato.fujita 2025-06-11 14:19:27 +0900
• 1b7ce68438 料理リスト編集機能(仮)の実装の実装 masato.fujita 2025-06-11 14:18:29 +0900
• 90db267963 StockPageを変更しました Yuna.Suzuki 2025-06-11 14:13:59 +0900
• f465550a05 recipeapi:add, getAll, getById, update develop-frontend-recipe-api zhang.pengcheng 2025-06-11 14:13:29 +0900
• 82b0465556 数値入力のバリデーション修正 feature-frontend-styles Masaharu.Kato 2025-06-11 14:09:58 +0900
• 026347f7e4 Merge remote-tracking branch 'origin/feature-frontend-top' into feature-frontend-styles Masaharu.Kato 2025-06-11 14:09:42 +0900
• de2229f4bc improve tobuylist UI Masaharu.Kato 2025-06-11 13:39:20 +0900
• 3c0b7596cc app name changed(login page) and app icon created Amagasu 2025-06-11 13:04:06 +0900
• bd242cbb3a Merge remote-tracking branch 'origin/develop-backend' into feature-backend-stock-fix feature-backend-stock-fix Amagasu 2025-06-11 10:53:51 +0900
• 322d6a4907 typo fixed feature-backend-datainit Amagasu 2025-06-11 10:48:14 +0900
• ec11504495 Merge remote-tracking branch 'origin/develop-backend' into feature-backend-datainit Amagasu 2025-06-11 10:43:29 +0900
• 9767b32edc default not initialize Amagasu 2025-06-11 10:28:13 +0900
• 9519d2336a recipe init add curry Amagasu 2025-06-11 10:26:30 +0900
• 95cd0540f4 holds order of stock list, after item updated Amagasu 2025-06-11 10:00:41 +0900
• a4994e20b9 Merge branch 'feature-backend-recipe' into develop-backend Masaharu.Kato 2025-06-11 09:55:55 +0900
• ba36fe74b3 買い物リスト編集機能の追加 Haru.Kusano 2025-06-10 17:18:55 +0900
• 08235b4159 数量修正 akito.nishiwaki 2025-06-10 16:55:21 +0900
• 1a3a0f2bfe SpringDocsを追加 feature-backend-add-springdocs Masaharu.Kato 2025-06-10 16:44:10 +0900
• 8e318ec32e 1. コードのコメントを修正と追加する 2. DTO​ファイル名の形式を統一する​ feature-backend-recipe zhang.pengcheng 2025-06-10 16:39:39 +0900
• 1ff7cfeb88 Merge remote-tracking branch 'origin/feature-frontend-register' into develop-frontend akito.nishiwaki 2025-06-10 16:27:20 +0900
• 044718ecf7 1. recipes: add, getAll, getById, update を実装しました zhang.pengcheng 2025-06-10 16:16:54 +0900
• 78325d386b Merge branch 'feature-frontend-register' of https://ivis.backlog.com/git/TRAIN2025_GROUP_K/joint_exc into feature-frontend-register akito.nishiwaki 2025-06-10 16:16:51 +0900
• 3e2ad30845 Merge remote-tracking branch 'origin/develop-frontend' into feature-frontend-stock Yuna.Suzuki 2025-06-10 16:12:56 +0900
• dc98e438c5 価格修正、店舗追加 akito.nishiwaki 2025-06-10 16:06:48 +0900
• 6e18cd8fcc stockpageを編集しました Yuna.Suzuki 2025-06-10 15:55:45 +0900
• d1cdd37900 stockpageを修正しました Yuna.Suzuki 2025-06-10 15:35:42 +0900
• 76ca839255 default not initialize Amagasu 2025-06-10 15:30:20 +0900
• 966b1cc7c6 Merge remote-tracking branch 'origin/feature-frontend-stock' into feature-backend-stock-fix Masaharu.Kato 2025-06-10 15:15:03 +0900
• bbbb935178 fix stock update API Masaharu.Kato 2025-06-10 15:14:45 +0900
• da669e5d54 stockpageとapiを修正しました Yuna.Suzuki 2025-06-10 15:12:26 +0900
• 47f92fa866 file name changed Amagasu 2025-06-10 14:28:53 +0900
• 36eb8e64c3 created stuff recipe recipestuff table init file Amagasu 2025-06-10 14:26:56 +0900
• e54b75f2c3 Merge remote-tracking branch 'origin/feature-backend-stock-fix' into feature-frontend-stock Yuna.Suzuki 2025-06-10 13:13:27 +0900
• 8fbe54badb 細かい編集 Yuna.Suzuki 2025-06-10 13:12:42 +0900
• 0b85079b10 created stuff-data initialize file Amagasu 2025-06-10 13:12:17 +0900
• eed4102962 fix api debug message Masaharu.Kato 2025-06-10 13:10:57 +0900
• 26ad09da97 Merge remote-tracking branch 'origin/feature-frontend-stock' into feature-backend-stock-fix Masaharu.Kato 2025-06-10 13:06:48 +0900
• 959491714b Fix backend Stock API Masaharu.Kato 2025-06-10 13:06:25 +0900
• 398ab54ba4 apiとstockpageを編集しました Yuna.Suzuki 2025-06-10 13:03:48 +0900
• aaa0ef605a 数量変更ボタンの追加 Haru.Kusano 2025-06-10 10:19:18 +0900
• 104d1bc44a Merge remote-tracking branch 'origin/develop-frontend' into feature-frontend-adddishes-logic feature-frontend-adddishes-logic Masaharu.Kato 2025-06-10 10:13:57 +0900
• 3ea9d4ac75 handleCreateTask_DataBase等の修正 feature_frontend_addDishes masato.fujita 2025-06-09 17:25:33 +0900
• 8a5bd92092 ボタンの間を追加 Haru.Kusano 2025-06-09 17:04:07 +0900
• cd8f3fd6c5 mergeしました Yuna.Suzuki 2025-06-09 16:58:02 +0900
• a599ab0767 Merge remote-tracking branch 'origin/develop-frontend' into feature-frontend-stock Yuna.Suzuki 2025-06-09 16:53:24 +0900
• 7e9297bc06 Merge branch 'develop-backend' into feature-backend-tobuy-stock-zhang feature-backend-tobuy-stock-zhang Masaharu.Kato 2025-06-09 16:44:46 +0900
• 48f1d23635 Merge branch 'feature-backend-tobuy-stock-zhang' into develop-backend zhang.pengcheng 2025-06-09 16:32:22 +0900
• 1611e50cc2 Merge remote-tracking branch 'origin/develop-frontend' into feature-frontend-top Haru.Kusano 2025-06-09 16:29:24 +0900
• 09870ccfa1 Merge remote-tracking branch 'origin/develop-backend' into develop-frontend Amagasu 2025-06-09 16:27:53 +0900
• e0dcd66962 stuff/get return sorted stuffs by stuff_name feature-backend-stuff Amagasu 2025-06-09 16:27:18 +0900
• 5f078bb6c5 1. stock: update, deleteを修正 2. tobuyコメントを修正 zhang.pengcheng 2025-06-09 16:23:29 +0900
• 5ca37822fc Merge remote-tracking branch 'origin/develop-frontend' into feature-frontend-register akito.nishiwaki 2025-06-09 16:18:37 +0900
• 978c0ad42b stockpageを編集しました Yuna.Suzuki 2025-06-09 16:16:04 +0900
• 26d65a4384 購入日、賞味期限の表示を逆にした akito.nishiwaki 2025-06-09 16:09:26 +0900