2026_09_5H_Spring_KIZAKI/Monegement
16
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
218 Commits 8 Branches 0 Tags
2372c81ddddea0fc36af3322260b10a337e6883f
Commit Graph

218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
s-morimoto
a8c46cc9db Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimto 2026-09-18 11:08:05 +09:00
k-oshita
702dd24d2e Merge branch 'n-kawahito' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-oshita 
# Conflicts:
#	src/main/java/com/example/demo/app/presentation/form/AnalysisForm.java
#	src/main/java/com/example/demo/app/presentation/form/CategoryAnalysisForm.java
 2026-09-18 11:04:06 +09:00
k-oshita
d71194659b [FIX]ゴールモデルのバグ修正 2026-09-18 11:02:42 +09:00
n-kawahito
f685b10d01 Merge branch 'k-kobayashi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into n-kawahito 
# Conflicts:
#	src/main/java/com/example/demo/app/domain/service/CourseInfoService.java
#	src/main/java/com/example/demo/app/domain/service/CourseService.java
 2026-09-18 11:01:44 +09:00
k-oshita
44ceb0ca07 Merge branch 'k-kobayashi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-oshita 
# Conflicts:
#	src/main/java/com/example/demo/app/domain/model/GoalModel.java
#	src/main/java/com/example/demo/app/domain/service/CourseInfoService.java
 2026-09-18 11:01:21 +09:00
kkazuya
f955667682 [ADD] いろいろ追加 2026-09-18 11:00:02 +09:00
kkazuya
b062f64ea4 [EDIT] /// 2026-09-18 10:59:01 +09:00
k-oshita
614533e2b0 Merge remote-tracking branch 'origin/k-kobayashi' into k-oshita 
# Conflicts:
#	src/main/java/com/example/demo/app/domain/service/CourseService.java
 2026-09-18 10:57:42 +09:00
kkazuya
00b584372e [EDIT] // 2026-09-18 10:57:07 +09:00
k-oshita
2da75305fd Merge remote-tracking branch 'origin/k-kobayashi' into k-oshita 
# Conflicts:
#	src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java
 2026-09-18 10:56:22 +09:00
n-kawahito
7e91071379 Merge branch 'k-kobayashi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into n-kawahito 
# Conflicts:
#	src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java
 2026-09-18 10:55:53 +09:00
k-oshita
f55ece4dc7 「STYLE] 目標名を追記しました。 2026-09-18 10:55:37 +09:00
kkazuya
b9e6b5662b [EDIT] スペース追加 2026-09-18 10:53:53 +09:00
k-oshita
0a63c81712 Merge branch 's-morimto' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-oshita 2026-09-18 10:39:13 +09:00
k-oshita
571fcc6d90 [add]余分なファイルをコミットしました 2026-09-18 10:16:49 +09:00
k-oshita
15185672c4 s-choiブランチとのマージ完了 2026-09-18 10:08:41 +09:00
k-oshita
3833689759 [ADD]目標を管理するため機能の追加 2026-09-18 10:05:15 +09:00
n-kawahito
abe5573c88 [ADD]支出分析画面のためのformクラスを作成しました。 2026-09-18 09:53:53 +09:00
n-kawahito
46fd6ee60c Merge branch 'n-kawahito' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into n-kawahito 2026-09-18 09:47:18 +09:00
n-kawahito
e40c64c2a9 [FIX]プッシュエラーのため、コミットリセット 2026-09-18 09:46:13 +09:00
n-kawahito
05dbbb4053 Merge branch 'n-kawahito' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into n-kawahito 2026-09-18 09:41:52 +09:00
n-kawahito
aa2a511d2b Merge branch 'k-kobayashi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into n-kawahito 2026-09-18 09:41:38 +09:00
n-kawahito
6d494e1ac1 Merge branch 'k-oshita' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into n-kawahito 2026-09-18 09:37:07 +09:00
n-kawahito
1c61909a48 Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into n-kawahito 2026-09-18 09:28:17 +09:00
kkazuya
c091b0491a Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-17 17:00:25 +09:00
s-choi
902167b663 [FIX] 数式エラーを修正しました。 2026-09-17 17:00:02 +09:00
s-choi
4590c9e5fe [FIX] 遷移先の住所を修正しました。 2026-09-17 16:59:40 +09:00
s-choi
aa5bf0c64e [FIX] 不要なフィールドを削除しました。 2026-09-17 16:58:40 +09:00
k-oshita
0bec7b3b3b [EDIT]目標モデルの改行 2026-09-17 16:52:56 +09:00
n-kawahito
d59cf78062 Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into n-kawahito 2026-09-17 16:50:04 +09:00
n-kawahito
f68a2569bd [FIX]ユーザー取得の例外処理を記述しました 2026-09-17 16:36:43 +09:00
kkazuya
fbec462f65 Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-17 16:35:42 +09:00
n-kawahito
a7d61be450 [FIX]分析値の「ー」部分の修正をしました。 2026-09-17 16:33:26 +09:00
s-choi
830d8a672f Merge remote-tracking branch 'origin/s-morimto' into s-choi 2026-09-17 16:31:50 +09:00
kkazuya
8b9765852b Merge branch 's-morimto' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-17 16:31:50 +09:00
kkazuya
ae53f3e733 Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-17 16:31:41 +09:00
s-morimoto
d87bdfbe91 [EDIT]controllerの修正 2026-09-17 16:28:23 +09:00
s-choi
22191e63ef Merge remote-tracking branch 'origin/s-morimto' into s-choi 2026-09-17 16:27:57 +09:00
kkazuya
e261065a62 Merge branch 's-morimto' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-17 16:26:31 +09:00
s-morimoto
49ad550839 [EDIT]メールアドレスの追加 2026-09-17 16:25:46 +09:00
s-choi
bd2cad7c34 Merge remote-tracking branch 'origin/n-kawahito' into s-choi 
# Conflicts:
#	src/main/java/com/example/demo/app/infra/repository/AllocationRepository.java
 2026-09-17 16:18:45 +09:00
s-choi
db7fc1d16d Merge remote-tracking branch 'origin/s-morimto' into s-choi 
# Conflicts:
#	src/main/java/com/example/demo/app/infra/repository/AllocationRepository.java
 2026-09-17 16:17:50 +09:00
k-oshita
662e3433d2 [EDIT]目標のModelの変換部分の修正 2026-09-17 16:12:15 +09:00
n-kawahito
23232954f1 Merge branch 'k-kobayashi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into n-kawahito 2026-09-17 16:08:12 +09:00
n-kawahito
4e3477af77 [EDIT]分析値の+-表記と色分けについて記述しました 2026-09-17 16:07:35 +09:00
kkazuya
296bcf8d70 Merge branch 'n-kawahito' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-17 16:03:38 +09:00
kkazuya
544cbd0ac8 Merge branch 's-morimto' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-17 16:02:58 +09:00
kkazuya
0eddd7889f Merge branch 's-morimto' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 
# Conflicts:
#	src/main/java/com/example/demo/app/infra/repository/AllocationRepository.java
 2026-09-17 16:02:22 +09:00
s-morimoto
192191d352 [ADD]パスワード再設定の作成 2026-09-17 15:59:33 +09:00
kkazuya
bda791567c [ADD] コース選択画面を作成しました。 2026-09-17 15:50:43 +09:00