Commit Graph
41 Commits
Author SHA1 Message Date
kkazuya 61da5163b0 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/presentation/controller/UserController.java
#	src/main/resources/templates/login.html
#	src/main/resources/templates/password_reset.html
2026-09-18 12:31:44 +09:00
kkazuya 8b6e20cb3a [EDIT] service,serviceInfoControllerを修正しました 2026-09-18 11:10:38 +09:00
kkazuya f955667682 [ADD] いろいろ追加 2026-09-18 11:00:02 +09:00
kkazuya b062f64ea4 [EDIT] /// 2026-09-18 10:59:01 +09:00
kkazuya 00b584372e [EDIT] // 2026-09-18 10:57:07 +09:00
kkazuya b9e6b5662b [EDIT] スペース追加 2026-09-18 10:53:53 +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
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
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
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
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
kkazuya bda791567c [ADD] コース選択画面を作成しました。 2026-09-17 15:50:43 +09:00
kkazuya 1e09463984 [ADD] コース選択画面に遷移するCourseControllerを作成しました。 2026-09-17 15:50:11 +09:00
kkazuya a89c54f8c0 [ADD] Course, CoureseInfoのサービスとそれを実装したクラスを作成しました。 2026-09-17 15:49:11 +09:00
kkazuya 7a13d9cdda Merge branch 'n-kawahito' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-17 15:31:40 +09:00
kkazuya 0c5f4a8c9b Merge branch 'k-oshita' 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/GoalRepository.java
2026-09-17 15:31:20 +09:00
kkazuya c5d1814be4 Merge branch 's-morimto' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-17 15:25:03 +09:00
kkazuya 170e319dca [ADD] CourseInfoModelを作成しました 2026-09-17 14:31:35 +09:00
kkazuya 6b91c91c19 [ADD] Course, CourseInfoFormを作成しました 2026-09-17 14:29:59 +09:00
kkazuya 0c19adb63f Merge branch 'n-kawahito' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-17 14:20:43 +09:00
kkazuya f86d47c17a [EDIT] AllocationRepositoryにコース一覧に表示するデータを取得する@Queryを追加しました 2026-09-17 14:20:34 +09:00
kkazuya 7f828657ad [ADD] Allocation, CourseのModelを追加しました。 2026-09-17 14:09:06 +09:00
kkazuya 064b74c49b Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-17 14:04:29 +09:00
kkazuya 4fc69cddb3 [EDIT] Course, AllocationEntityのテーブル名を修正 2026-09-17 14:04:20 +09:00
kkazuya 792172664c Merge branch 'n-kawahito' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-17 12:44:49 +09:00
kkazuya 882212aed5 Merge branch 's-morimto' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-17 11:24:54 +09:00
kkazuya 1369d839af Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-17 11:16:21 +09:00
kkazuya 7f454b852a [ADD] AllocationRepositoryを作成しました。 2026-09-17 11:16:12 +09:00
kkazuya f1b5e3eaf8 Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-17 10:49:58 +09:00
kkazuya 59cec2fed7 Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-17 10:47:23 +09:00
kkazuya 743fe20e9a Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-17 10:36:08 +09:00
kkazuya 7a38ba8e63 [ADD] CategoryFormを作成しました。 2026-09-17 10:35:28 +09:00
kkazuya cf732c7a48 [ADD] CategoryModelを作成しました 2026-09-17 10:30:49 +09:00
kkazuya e361e02aa8 [ADD] Category, Course, AllocationのRepositoryを作成しました。 2026-09-16 16:34:31 +09:00
kkazuya 837a82ef9a Merge branch 'n-kawahito' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-16 16:30:49 +09:00
kkazuya 40ada62856 Merge branch 'n-kawahito' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-16 15:26:29 +09:00
kkazuya 9710b52d8d [EDIT] Category, CourseEntityのIDの型をlong⇒Longに変更 2026-09-16 15:03:18 +09:00
kkazuya c41bcd1791 [EDIT] Categoruy, CourseEntityのIDの型をlongに変更しました。 2026-09-16 14:56:27 +09:00