h-seya
|
141f3e3b5d
|
Merge remote-tracking branch 'origin/y-kumaki'
# Conflicts:
# src/main/java/com/example/demo/service/BookLendService.java
|
2026-09-29 16:14:52 +09:00 |
|
y-kumaki
|
441d91d1e2
|
[ADD] 貸出中図書一覧の返却処理を追加しました。
|
2026-09-29 13:44:21 +09:00 |
|
s-tajihi
|
d6d9aa555b
|
[edit] 「削除済み図書が表示されるバグ」の修正をしました
|
2026-09-29 11:16:04 +09:00 |
|
s-tajihi
|
22a213a4db
|
Merge branch 'h-seya' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into s-tajihi
|
2026-09-29 10:07:14 +09:00 |
|
h-seya
|
d0d266d970
|
[EDIT]:画面遷移ができなくなるエラー修正
|
2026-09-29 10:06:49 +09:00 |
|
s-tajihi
|
013b08e9b8
|
Merge branch 'y-watanabe' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into s-tajihi
|
2026-09-29 09:56:38 +09:00 |
|
s-tajihi
|
443e416386
|
Merge branch 'a-kawaguchi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into s-tajihi
|
2026-09-29 09:56:29 +09:00 |
|
s-tajihi
|
9b4b31924b
|
Merge branch 'h-seya' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into s-tajihi
|
2026-09-29 09:56:22 +09:00 |
|
|
|
89171b8561
|
[edit]新規図書登録ポップアップを追加
|
2026-09-29 09:52:36 +09:00 |
|
|
|
01ffb88358
|
ログイン者の名前の表示および与えられたロールによってトップメニューの表示内容を分ける機能を追加
|
2026-09-29 09:40:34 +09:00 |
|
h-seya
|
8c633eabf4
|
[EDIT]:図書一覧画面から貸出処理画面に遷移後、図書情報を引き継ぐ処理を追加
|
2026-09-28 17:01:38 +09:00 |
|
s-tajihi
|
5c9ea74c69
|
Merge branch 'y-watanabe' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into s-tajihi
|
2026-09-28 16:57:57 +09:00 |
|
|
|
10f7551bbd
|
Merge branch 's-tajihi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into a-kawaguchi
|
2026-09-28 16:54:36 +09:00 |
|
|
|
49c40a05c4
|
[add]絞り込み機能の修正
|
2026-09-28 14:53:31 +09:00 |
|
|
|
229f578d69
|
Merge branch 'y-watanabe' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into a-kawaguchi
|
2026-09-28 13:40:48 +09:00 |
|
s-tajihi
|
df4cc6465c
|
Merge branch 'y-watanabe' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into s-tajihi
|
2026-09-28 13:14:29 +09:00 |
|
|
|
cf4eba2761
|
Merge branch 's-tajihi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into y-watanabe
|
2026-09-28 13:10:53 +09:00 |
|
|
|
280331fdf6
|
[add]ISBN条件を追加
|
2026-09-28 13:09:29 +09:00 |
|
h-seya
|
a562e23919
|
Merge branch 's-tajihi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into h-seya
|
2026-09-28 13:06:31 +09:00 |
|
s-tajihi
|
27a4fa71c4
|
Merge branch 'y-kumaki' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into s-tajihi
|
2026-09-28 13:05:15 +09:00 |
|
s-tajihi
|
d452eae384
|
[edit] 図書一覧画面（一般ユーザ）の表示内容修正を行いました
|
2026-09-28 13:02:45 +09:00 |
|
h-seya
|
fa1846dbd7
|
Merge branch 's-tajihi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into h-seya
|
2026-09-28 12:57:21 +09:00 |
|
s-tajihi
|
79fd664f86
|
[edit] HTML表示内容（セッション判別）を追加しました
|
2026-09-28 11:34:02 +09:00 |
|
h-seya
|
d6134fab10
|
Merge branch 'y-kumaki' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into h-seya
|
2026-09-28 10:54:53 +09:00 |
|
y-kumaki
|
da5cc25c34
|
[ADD] 貸出一覧表示の貸出中のみ表示される処理を追加しました。
|
2026-09-28 10:52:46 +09:00 |
|
s-tajihi
|
d558372236
|
[edit] 社内図書一覧画面→トップメニューを修正しました
|
2026-09-28 09:37:58 +09:00 |
|
s-tajihi
|
106b614944
|
Merge branch 'y-watanabe' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into s-tajihi
|
2026-09-25 16:59:53 +09:00 |
|
|
|
044210adc3
|
[add]誤字修正
|
2026-09-25 16:59:14 +09:00 |
|
s-tajihi
|
335ad988e1
|
Merge branch 'h-seya' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into s-tajihi
|
2026-09-25 16:39:21 +09:00 |
|
s-tajihi
|
bce2ad0a5d
|
Merge branch 'y-watanabe' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into s-tajihi
|
2026-09-25 16:39:12 +09:00 |
|
|
|
8e9a73afa7
|
Merge branch 's-tajihi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into y-watanabe
|
2026-09-25 16:38:17 +09:00 |
|
|
|
cff0436daf
|
Merge branch 'h-seya' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into y-watanabe
|
2026-09-25 16:38:10 +09:00 |
|
s-tajihi
|
fef19ff579
|
Merge branch 'y-kumaki' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into s-tajihi
|
2026-09-25 16:37:32 +09:00 |
|
h-seya
|
aec3f3d4e6
|
Merge branch 's-tajihi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into h-seya
|
2026-09-25 16:36:29 +09:00 |
|
|
|
7b70861fd8
|
[add]プルダウンを追加しました
|
2026-09-25 16:36:18 +09:00 |
|
h-seya
|
856913615f
|
[EDIT]:社員IDプルダウンとDB連携処理の実装途中
|
2026-09-25 16:36:17 +09:00 |
|
s-tajihi
|
d7e12cc4f1
|
[edit] 図書一覧画面の検索機能を追加しました
|
2026-09-25 16:12:16 +09:00 |
|
h-seya
|
795058750b
|
Merge branch 'y-kumaki' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into h-seya
# Conflicts:
# src/main/java/com/example/demo/repository/BookLendRepository.java
# src/main/java/com/example/demo/service/BookLendService.java
|
2026-09-25 15:34:37 +09:00 |
|
y-kumaki
|
ed78956074
|
no message
|
2026-09-25 15:30:31 +09:00 |
|
h-seya
|
63ddcdf82a
|
Merge branch 's-tajihi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into h-seya
|
2026-09-25 13:37:38 +09:00 |
|
s-tajihi
|
772d0ef594
|
[edit] 表示内容の修正をしました
|
2026-09-25 13:36:06 +09:00 |
|
y-kumaki
|
ea262e10c5
|
no message
|
2026-09-25 13:30:55 +09:00 |
|
h-seya
|
8d69541d09
|
Merge branch 'y-watanabe' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into h-seya
|
2026-09-25 13:30:20 +09:00 |
|
|
|
420d3cd44c
|
[add]サブカテゴリーのRepositoryを追加
|
2026-09-25 13:29:41 +09:00 |
|
h-seya
|
8a859d8dea
|
Merge branch 'y-watanabe' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into h-seya
|
2026-09-25 13:27:06 +09:00 |
|
|
|
07c62be1bd
|
[add]カテゴリ・サブカテゴリのプルダウンを追加
|
2026-09-25 13:25:30 +09:00 |
|
h-seya
|
453892baaf
|
Merge branch 's-tajihi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into h-seya
|
2026-09-25 12:44:11 +09:00 |
|
s-tajihi
|
14e060588c
|
[edit] 「更新」ボタンからの遷移を追加しました
|
2026-09-25 12:43:41 +09:00 |
|
s-tajihi
|
67a8576a59
|
[delete] 不要なファイルを削除しました
|
2026-09-25 11:24:24 +09:00 |
|
h-seya
|
22b32a5ea2
|
[ADD]:図書貸出処理に使用予定の、クラス及びインターフェースを作成
|
2026-09-25 11:21:05 +09:00 |
|
