Commit Graph
92 Commits
Author SHA1 Message Date
26-o-matsuda-stellatecnica 044a6b5609 Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda
# Conflicts:
#	book-rent/pom.xml
#	book-rent/src/main/java/com/example/demo/config/CustomAuthenticationFailureHandler.java
#	book-rent/src/main/java/com/example/demo/service/CustomUserDetailsService.java
2026-10-27 15:22:16 +09:00
26-h-kyaw-sakuracommunication a9c5fb2283 All done 2026-10-27 15:07:10 +09:00
26-o-matsuda-stellatecnica bc8c93d2ea Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda
# Conflicts:
#	book-rent/src/main/resources/static/css/style.css
2026-10-27 14:47:24 +09:00
26-h-kyaw-sakuracommunication f7020dd41a 小澤さんの作成 2026-10-27 14:33:13 +09:00
26-o-matsuda-stellatecnica adf3ece0d2 バリテーション追加 2026-10-27 14:25:06 +09:00
26-t-eguchi-tmn 309b2a2b79 プルNG 2026-10-27 13:52:32 +09:00
26-t-eguchi-tmn fa606e3cbf ログインロック 2026-10-27 13:29:46 +09:00
26-t-eguchi-tmn 72bd137e8d ログインロック機能 2026-10-27 10:59:00 +09:00
26-h-kyaw-sakuracommunication dd8fc3151f Merge branch 'main' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into h-hein2 2026-10-27 09:43:15 +09:00
26-h-kyaw-sakuracommunication 2687c00f35 Login Desing Html Css 2026-10-27 09:34:55 +09:00
26-o-matsuda-stellatecnica 47947636a1 書籍名よみと社員名よみのバリテーション完了 2026-10-26 15:14:09 +09:00
m-shimizu 9c591c9ff2 登録確認ボタン_配置修正 2026-10-22 09:56:34 +09:00
26-t-eguchi-tmn 61e89fc36f 承認画面のレイアウト変更しました 2026-10-22 09:54:49 +09:00
26-h-kyaw-sakuracommunication 10182adc6d layout Edit 2026-10-22 09:29:36 +09:00
m-shimizu e73b98e76d Merge branch 't-eguchi' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into m_shimizu 2026-10-21 16:27:14 +09:00
m-shimizu b36bce38e1 FR-09 2026-10-21 16:26:55 +09:00
26-t-eguchi-tmn da41c781df レイアウト変更を行いました 2026-10-21 16:22:56 +09:00
26-h-kyaw-sakuracommunication 103acf1106 Merge branch 'm_shimizu' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into h-hein2 2026-10-21 14:28:51 +09:00
m-shimizu 7d5d038a9e FR-09 2026-10-21 14:27:40 +09:00
26-h-kyaw-sakuracommunication 6f56164c13 Merge branch 'o-matsuda' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into h-hein2 2026-10-21 14:27:19 +09:00
26-o-matsuda-stellatecnica ce94b90bf1 Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda
# Conflicts:
#	book-rent/src/main/resources/templates/employeeUpdateConfirm.html
2026-10-21 14:26:59 +09:00
26-h-kyaw-sakuracommunication 9db673abb8 Merge branch 't-eguchi' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into h-hein2 2026-10-21 10:51:51 +09:00
26-o-matsuda-stellatecnica abb1cda6bf employeeupdate.html途中 2026-10-21 10:26:08 +09:00
26-h-kyaw-sakuracommunication 3e0be17cef Employee Update Confirm 2026-10-21 10:22:00 +09:00
26-t-eguchi-tmn b9036465f2 返却機能 2026-10-21 10:03:06 +09:00
m-shimizu 7362f58c4f Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into m_shimizu 2026-10-21 10:02:58 +09:00
26-o-matsuda-stellatecnica 9728e2a983 Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda 2026-10-21 10:02:29 +09:00
26-h-kyaw-sakuracommunication 8a0b53522b Employee Controller 2026-10-21 10:02:14 +09:00
26-o-matsuda-stellatecnica fecf19636f Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda 2026-10-21 09:40:01 +09:00
26-h-kyaw-sakuracommunication b298aa01c3 書き出し中一覧に表示 2026-10-21 09:24:53 +09:00
26-t-eguchi-tmn e5f3a3774a お願いします 2026-10-20 16:38:00 +09:00
m-shimizu 9ef18e73ed Merge branch 'm-ozawa' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into m_shimizu 2026-10-20 16:31:18 +09:00
26-o-matsuda-stellatecnica a17aa3ae93 Merge branch 'm-ozawa' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda 2026-10-20 16:29:51 +09:00
26-m-ozawa-swnet 879d7235e0 10/20 作業分 2026-10-20 16:10:51 +09:00
26-o-matsuda-stellatecnica 40c08ea6b4 書籍登録のHTML途中 2026-10-20 16:10:36 +09:00
m-shimizu 45eff1634e FR-09_全体反映なし 2026-10-20 16:10:15 +09:00
m-shimizu 136b18bfc7 FR-01 2026-10-20 16:08:03 +09:00
26-t-eguchi-tmn 3d5653418a 05番完了 2026-10-20 16:04:18 +09:00
26-o-matsuda-stellatecnica f87e6d60c9 Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda 2026-10-20 15:33:35 +09:00
26-m-ozawa-swnet 0754c4507e mm 2026-10-20 15:27:39 +09:00
26-m-ozawa-swnet ef71711641 s3 2026-10-20 15:24:01 +09:00
26-m-ozawa-swnet 6b2c08c031 2 2026-10-20 15:23:08 +09:00
26-t-eguchi-tmn b6d24a3d05 Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into t-eguchi 2026-10-20 15:22:43 +09:00
26-h-kyaw-sakuracommunication b128e92598 3 stept done 2026-10-20 15:22:39 +09:00
26-t-eguchi-tmn 6faaedaa95 コンフリクト解消 2026-10-20 15:22:30 +09:00
26-m-ozawa-swnet 1585457395 Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into m-ozawa 2026-10-20 15:03:26 +09:00
26-h-kyaw-sakuracommunication 3e1eb9f6bd AdminloanController done 2026-10-20 14:59:58 +09:00
26-t-eguchi-tmn b6ada277a2 途中 2026-10-20 14:59:26 +09:00
26-o-matsuda-stellatecnica 3f304d8e12 Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda
# Conflicts:
#	book-rent/src/main/java/com/example/demo/controller/AdminBookController.java
2026-10-20 14:36:00 +09:00
m-shimizu 9bba174df3 FR-01 2026-10-20 14:26:51 +09:00