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

• 0376de189c ボタンの説明文の追加 Haru.Kusano 2025-06-09 16:08:02 +0900
• ca3b06b24a Merge branch 'develop-backend' into develop-frontend Masaharu.Kato 2025-06-09 16:02:45 +0900
• 09e891c27a Merge remote-tracking branch 'origin/feature-backend-stuff' into feature-backend-tobuy-buy feature-backend-tobuy-buy Masaharu.Kato 2025-06-09 16:00:22 +0900
• 5a84c5848a change front api (stuff category get) Amagasu 2025-06-09 15:51:18 +0900
• c86626fc23 在庫取得のUI修正 Masaharu.Kato 2025-06-09 15:44:06 +0900
• 9e1142ae09 購入処理のUI実装 Masaharu.Kato 2025-06-09 15:44:00 +0900
• 285ef1e81e 在庫取得の完全実装 Masaharu.Kato 2025-06-09 15:43:44 +0900
• 765fec0ebc 購入処理のAPI実装 Masaharu.Kato 2025-06-09 15:43:36 +0900
• 22ac67172e 古いtaskApiの削除，エラーメッセージ変数の修正 Masaharu.Kato 2025-06-09 15:43:00 +0900
• 7a0bc34eb0 編集ダイアログと削除ダイアログを作成しました Yuna.Suzuki 2025-06-09 15:17:24 +0900
• e4414713dc create API stuffs/get (get all stuffs which has input category) Amagasu 2025-06-09 15:11:35 +0900
• d21b2276fa Merge remote-tracking branch 'origin/feature-backend-tobuy-stock' into feature-frontend-register akito.nishiwaki 2025-06-09 14:39:50 +0900
• 549914ca57 calender akito.nishiwaki 2025-06-09 14:34:40 +0900
• e44ac9fe4d commit akito.nishiwaki 2025-06-09 14:33:55 +0900
• 348f6c9a3e 店舗入力フィールド akito.nishiwaki 2025-06-09 14:20:16 +0900
• 571a629a02 Merge remote-tracking branch 'origin/feature-backend-tobuy-stock-zhang' into feature-backend-tobuy-stock feature-backend-tobuy-stock Masaharu.Kato 2025-06-09 13:48:28 +0900
• d7c2eadb09 tobuyの返す修正しました zhang.pengcheng 2025-06-09 13:43:26 +0900
• b08c92f6c0 Fix response of tobuy API Masaharu.Kato 2025-06-09 13:39:25 +0900
• 865f1e2337 Merge remote-tracking branch 'origin/feature-backend-tobuy-stock-2' into feature-backend-tobuy-stock Masaharu.Kato 2025-06-09 13:32:28 +0900
• 292bb6e43b remove _id feature-backend-tobuy-stock-2 Amagasu 2025-06-09 13:31:03 +0900
• 46963ed46c 配列を生で返すように修正 Masaharu.Kato 2025-06-09 13:25:42 +0900
• b048eb01d5 change to camelcase in frontend Masaharu.Kato 2025-06-09 13:03:59 +0900
• 527194d5b7 add vscode backend debugger Masaharu.Kato 2025-06-09 13:03:35 +0900
• 9a377b4aa0 ボタンの隙間を追加(仮) Haru.Kusano 2025-06-09 12:00:39 +0900
• 279d689980 first commit akito.nishiwaki 2025-06-09 11:54:22 +0900
• 19a3c62d6c Merge branch 'dev-frontend-add_dishes' into feature_frontend_addDishes masato.fujita 2025-06-09 11:49:47 +0900
• b9bb66b6d5 アプリ名をshopchopに設定 Haru.Kusano 2025-06-09 11:39:47 +0900
• 2a5d743c78 Merge remote-tracking branch 'origin/develop-frontend' into feature-frontend-top Haru.Kusano 2025-06-09 11:33:15 +0900
• 4f674c858a 料理から追加ボタンから料理追加ページへ遷移するように dev-frontend-add_dishes masato.fujita 2025-06-09 11:29:45 +0900
• 33428779d5 recipestuff default change Amagasu 2025-06-09 11:21:34 +0900
• a4db8a5017 Merge remote-tracking branch 'origin/develop-frontend' into feature-frontend-stock Yuna.Suzuki 2025-06-09 11:19:19 +0900
• 6f6365ffa8 StockPagwを編集しました dev-frontend-stock Yuna.Suzuki 2025-06-09 10:56:59 +0900
• b7b4f1ac12 Merge branch 'feature-backend-tobuy' into feature-backend-tobuy-stock Amagasu 2025-06-09 10:54:03 +0900
• 7c7677e469 「買うものリスト」のタイトルに修正 release/sprint1 backend-tobuy-stable Masaharu.Kato 2025-06-09 10:47:04 +0900
• ea8d4c4f8a Merge remote-tracking branch 'origin/backend-tobuy-stable' into dev-frontend-top dev-frontend-top Haru.Kusano 2025-06-06 15:03:47 +0900
• 5ec9452590 タイトル変更 Haru.Kusano 2025-06-06 14:10:53 +0900
• c993525931 Merge remote-tracking branch 'origin/release/sprint1' into feature-backend-tobuy Amagasu 2025-06-06 13:16:17 +0900
• 1df241c865 varname _ remove, id type int -> long Amagasu 2025-06-06 13:15:50 +0900
• 555cf9ac0d Merge branch 'dev-backend-stocks' into feature-backend-tobuy Amagasu 2025-06-06 11:11:40 +0900
• ab4996091e wip: add dish backend-tobuy-adddish Masaharu.Kato 2025-06-06 11:05:59 +0900
• c0c025dc40 build-passed dev-backend-tobuy Amagasu 2025-06-06 11:01:23 +0900
• 6d568ec6bf Merge remote-tracking branch 'origin/dev-frontend-在庫登録' into backend-tobuy-stable Masaharu.Kato 2025-06-06 11:01:01 +0900
• aa2dfdfaf9 処理を一部コメントアウト dev-frontend-在庫登録 akito.nishiwaki 2025-06-06 10:59:42 +0900
• 161028fb9b 処理をコメントアウト akito.nishiwaki 2025-06-06 10:57:19 +0900
• ebdbaa45d3 Merge remote-tracking branch 'origin/dev-frontend-add_dishes' into dev-frontend-在庫登録 akito.nishiwaki 2025-06-06 10:55:59 +0900
• 43d69e2f8e 料理に必要な食材をタスク一覧に表示されるよう修正 masato.fujita 2025-06-06 10:51:01 +0900
• 63ebb7b2a1 料理追加へのボタン推移 Haru.Kusano 2025-06-06 10:50:35 +0900
• b17537cb71 購入ボタンを押してもリストから消えないよう修正 Masaharu.Kato 2025-06-06 10:50:30 +0900
• 63f2976795 Merge remote-tracking branch 'origin/release/sprint1' into backend-tobuy-stable Masaharu.Kato 2025-06-06 10:45:15 +0900
• 9af89cc6e5 新規追加時に明示的にnullを設定 Masaharu.Kato 2025-06-06 10:42:20 +0900
• 3f208a86bb 既存の食材追加に対応 Masaharu.Kato 2025-06-06 10:12:29 +0900
• 8d0cb88d7f Merge remote-tracking branch 'origin/dev-frontend-stock' into dev-frontend-在庫登録 akito.nishiwaki 2025-06-06 09:59:43 +0900
• ca789ae18c レビュー akito.nishiwaki 2025-06-06 09:56:14 +0900
• b52b88b7db StockPageを編集しました Yuna.Suzuki 2025-06-06 09:51:11 +0900
• fbc186bcc0 入力した料理に必要な材料を入力し、追加ボタンを押すことで画面にその内容が表示されるよう修正 masato.fujita 2025-06-06 09:43:36 +0900
• f48014da09 買うものリスト（材料新規追加）の動作確認 Masaharu.Kato 2025-06-06 09:30:30 +0900
• ad810e58cd Merge branch 'dev-frontend-top' into backend-tobuy-stable Masaharu.Kato 2025-06-06 09:05:31 +0900
• a86180989b WIP:バグ修正 Masaharu.Kato 2025-06-06 08:58:38 +0900
• 067c5783e7 stuff int -> long Amagasu 2025-06-05 17:01:10 +0900
• 4e73ccf51c 数量表示調整 akito.nishiwaki 2025-06-05 16:25:08 +0900
• 6270a14d4c Merge remote-tracking branch 'origin/dev-frontend-stock' into dev-frontend-top Haru.Kusano 2025-06-05 16:21:37 +0900
• 7e5698f362 レイアウトの変更 Haru.Kusano 2025-06-05 16:17:16 +0900
• 76370a694f Stockpageを編集しました Yuna.Suzuki 2025-06-05 16:16:23 +0900
• e25a5e74a7 Merge branch 'dev-frontend-top' into dev-backend-tobuy Masaharu.Kato 2025-06-05 16:14:49 +0900
• 184c3846cf エラーに対処 Masaharu.Kato 2025-06-05 16:14:33 +0900
• 99d34a0eed managing Amagasu 2025-06-05 16:05:46 +0900
• 50813ac9eb 材料の追加の実装 Masaharu.Kato 2025-06-05 15:56:57 +0900
• 366637bb76 Merge branch 'dev-frontend-top' of https://ivis.backlog.com/git/TRAIN2025_GROUP_K/joint_exc into dev-frontend-top Haru.Kusano 2025-06-05 15:32:10 +0900
• 5a3c49176a 仮：材料プルダウンの作成 Haru.Kusano 2025-06-05 15:30:41 +0900
• cca656158a make test case Masaharu.Kato 2025-06-05 15:29:18 +0900
• 5564f6e507 typo fix Amagasu 2025-06-05 15:23:44 +0900
• e163415c46 カテゴリ別の仮API作成 Masaharu.Kato 2025-06-05 15:17:14 +0900
• 664a071ef9 add stocksrepository.java by copy Amagasu 2025-06-05 15:11:39 +0900
• e01724ace4 remove tobuysbuydto Amagasu 2025-06-05 14:54:22 +0900
• f1126fb4d9 remove unused import Amagasu 2025-06-05 14:52:56 +0900
• 7f0c86bc3f prepare to merge between dev-backend-tobuys dev-backend-stocks Amagasu 2025-06-05 14:49:57 +0900
• cc1efbf179 prepare to merge between dev-backend-stocks Amagasu 2025-06-05 14:48:13 +0900
• db72254b5f fixed stock entity key Amagasu 2025-06-05 14:31:50 +0900
• 0f522ad628 create dto for buy tobuy Amagasu 2025-06-05 14:27:51 +0900
• d3c0e5eaf3 create but function to tobuys Amagasu 2025-06-05 14:27:11 +0900
• d0632e0dff 在庫管理API（仮）の実装 dev-frontend-with-api Masaharu.Kato 2025-06-05 13:52:19 +0900
• b1f8a53a31 コメント修正しました zhang.pengcheng 2025-06-05 13:45:32 +0900
• b3002ec297 マージ後の修正 Haru.Kusano 2025-06-05 13:45:01 +0900
• 036fbfa09a 変更を実装しました zhang.pengcheng 2025-06-05 13:43:32 +0900
• 0ab34c9217 Merge remote-tracking branch 'origin/dev-frontend-stock' into dev-frontend-with-api Masaharu.Kato 2025-06-05 13:42:25 +0900
• c2f4bf0f52 在庫管理リストページを追加しました Yuna.Suzuki 2025-06-05 13:36:12 +0900
• e121a7c7d5 Merge remote-tracking branch 'origin/dev-frontend-with-api' into dev-frontend-top Haru.Kusano 2025-06-05 13:28:02 +0900
• ca0637098f Merge remote-tracking branch 'origin/dev-frontend-在庫登録' into dev-frontend-top Haru.Kusano 2025-06-05 13:23:53 +0900
• ea753380ab pacageの変更 Haru.Kusano 2025-06-05 13:15:34 +0900
• b7b073042e 名前の変更 Haru.Kusano 2025-06-05 13:13:33 +0900
• f15b912d4f 在庫登録 akito.nishiwaki 2025-06-05 13:10:03 +0900
• 88d927c3fe (add, delete) Long user_id → Authentication authentication zhang.pengcheng 2025-06-05 13:08:50 +0900
• a8112ff4fd チェックボックスの作成 Haru.Kusano 2025-06-05 13:08:29 +0900
• 1f43448fcb チェックボックスの作成 Haru.Kusano 2025-06-05 13:08:14 +0900
• 6cf66af7ca created stock backend(controller, dto, repository, service) Amagasu 2025-06-05 13:06:39 +0900
• 21d8816506 買うものリストの表示を実装 Masaharu.Kato 2025-06-05 11:58:02 +0900
• 7d173a03dc stuff_nameを追加 zhang.pengcheng 2025-06-05 11:51:04 +0900
• ddec6a2e23 1. Long user_id → Authentication authentication 2. SecurityConfig .anyRequest().permitAll();無効する zhang.pengcheng 2025-06-05 11:47:59 +0900
• 411327ec40 Merge branch 'dev-frontend-top' into dev-frontend-add_dishes masato.fujita 2025-06-05 11:18:14 +0900
• 7e9759b376 ページ遷移時に入力された料理名を表示するよう変更 masato.fujita 2025-06-05 10:58:00 +0900