Commits · 1722f5fc75741c21eb6f2d2848df8ca85755db6d · abook_web / check · GitLab

14 Nov, 2022 5 commits
- Merge branch 'feature/1.0_check_web_dev' into feature/1.0_check_web_dev_kdh_2 · 1722f5fc
```
# Conflicts:
#	abweb/html/accountSetting.html
#	abweb/html/dashboard.html
#	abweb/html/pdfPrint.html
#	abweb/html/pickup.html
#	abweb/html/pushMessageDetail.html
#	abweb/html/reportForm.html
#	abweb/html/reportList.html
#	abweb/js/header/header.js
```
  Kang Donghun committed Nov 14, 2022
  1722f5fc Browse Files
- Merge branch 'feature/1.0_check_web_dev_imai' into 'feature/1.0_check_web_dev' · 07e249ac
```
Feature/1.0 check web dev imai

See merge request !49
```
  Kang Donghun committed Nov 14, 2022
  07e249ac Browse Files
- Merge branch 'feature/1.0_check_web_dev' into feature/1.0_check_web_dev_kdh_2 · 10876628
```
# Conflicts:
#	abweb/common/js/header.js
#	abweb/html/pdfPrint.html
#	abweb/html/reportForm.html
#	abweb/html/reportList.html
#	abweb/js/header/header.js
```
  Kang Donghun committed Nov 14, 2022
  10876628 Browse Files
- 修正 · 13d64db1
  Takumi Imai committed Nov 14, 2022
  
  13d64db1 Browse Files
- 修正 · 310fb42a
  Takumi Imai committed Nov 14, 2022
  
  310fb42a Browse Files
11 Nov, 2022 35 commits
- Merge branch 'feature/1.0_check_web_dev' into feature/1.0_check_web_dev_imai · 684f3747
  Takumi Imai committed Nov 12, 2022
  
  684f3747 Browse Files
- コメント変更 · 018426bb
  Takumi Imai committed Nov 12, 2022
  
  018426bb Browse Files
- #49767　報告フォーム取得処理修正 · 8db571a6
  Takumi Imai committed Nov 11, 2022
  
  8db571a6 Browse Files
- Merge branch 'feature/1.0_check_web_dev_imai' into 'feature/1.0_check_web_dev' · a1be92e9
```
Feature/1.0 check web dev imai

See merge request !48
```
  Kang Donghun committed Nov 11, 2022
  a1be92e9 Browse Files
- initのコメント追加 · 582dfa9e
  Takumi Imai committed Nov 11, 2022
  
  582dfa9e Browse Files
- 引数追加 · ecb94893
  Takumi Imai committed Nov 11, 2022
  
  ecb94893 Browse Files
- コメント & 英語化 · 350b3069
  Takumi Imai committed Nov 11, 2022
  
  350b3069 Browse Files
- #49772　ローディング · 5168bcdd
  Takumi Imai committed Nov 11, 2022
  
  5168bcdd Browse Files
- Merge branch 'feature/1.0_check_web_dev' into feature/1.0_check_web_dev_imai · 4d6db034
```
# Conflicts:
#	abweb/html/pdfPrint.html
#	abweb/html/reportList.html
```
  Takumi Imai committed Nov 11, 2022
  4d6db034 Browse Files
- 不要関数削除 · c04bd4b9
  Takumi Imai committed Nov 11, 2022
  
  c04bd4b9 Browse Files
- header js 整理 · 0a0a151f
  Kang Donghun committed Nov 11, 2022
  
  0a0a151f Browse Files
- loading display patch · d898d516
  Kang Donghun committed Nov 11, 2022
  
  d898d516 Browse Files
- Merge branch 'feature/1.0_check_web_dev_kdh_2' into 'feature/1.0_check_web_dev' · 1d6a4e80
```
Add app.js

See merge request !47
```
  Kang Donghun committed Nov 11, 2022
  1d6a4e80 Browse Files
- Add app.js · db4e659e
  Kang Donghun committed Nov 11, 2022
  
  db4e659e Browse Files
- Merge branch 'feature/1.0_check_web_dev_kdh_2' into 'feature/1.0_check_web_dev' · 5efeac1c
```
loading display patch

See merge request !46
```
  Takumi Imai committed Nov 11, 2022
  5efeac1c Browse Files
- Merge branch 'feature/1.0_check_web_dev' into feature/1.0_check_web_dev_kdh_2 · 252fb601
  Kang Donghun committed Nov 11, 2022
  
  252fb601 Browse Files
- CSS修正 · bd126dbe
  Kang Donghun committed Nov 11, 2022
  
  bd126dbe Browse Files
- loading display patch · 299d631c
  Kang Donghun committed Nov 11, 2022
  
  299d631c Browse Files
- 重複jquery削除 · 5ad90a0b
  Takumi Imai committed Nov 11, 2022
  
  5ad90a0b Browse Files
- Merge branch 'feature/1.0_check_web_dev' into feature/1.0_check_web_dev_imai · 039f9411
  Takumi Imai committed Nov 11, 2022
  
  039f9411 Browse Files
- Revert "いらないファイル削除" · 9d8ee2f6
```
This reverts commit f0c4114c.
```
  Takumi Imai committed Nov 11, 2022
  9d8ee2f6 Browse Files
- いらないファイル削除 · f0c4114c
  Takumi Imai committed Nov 11, 2022
  
  f0c4114c Browse Files
- Merge branch 'feature/1.0_check_web_dev_kdh_2' into 'feature/1.0_check_web_dev' · 753be672
```
Feature/1.0 check web dev kdh 2

See merge request !45
```
  Takumi Imai committed Nov 11, 2022
  753be672 Browse Files
- コード整理 · 3dbaa1f6
  Kang Donghun committed Nov 11, 2022
  
  3dbaa1f6 Browse Files
- Merge branch 'feature/1.0_check_web_dev' into feature/1.0_check_web_dev_kdh_2 · 6cf9efba
```
# Conflicts:
#	abweb/common/js/constant.js
#	abweb/html/accountSetting.html
#	abweb/html/dashboard.html
#	abweb/html/index.html
#	abweb/html/pdfPrint.html
#	abweb/html/pickup.html
#	abweb/html/pushMessageDetail.html
#	abweb/html/pushMessageList.html
#	abweb/html/reportList.html
#	abweb/html/sendMessage.html
#	abweb/js/reportList/reportList.js
```
  Kang Donghun committed Nov 11, 2022
  6cf9efba Browse Files
- Merge branch 'feature/1.0_check_web_dev_imai' into 'feature/1.0_check_web_dev' · 6e790414
```
Feature/1.0 check web dev imai

See merge request !44
```
  Kang Donghun committed Nov 11, 2022
  6e790414 Browse Files
- ファイルの場所変更 · 38363938
  Takumi Imai committed Nov 11, 2022
  
  38363938 Browse Files
- design application · 5176e72b
  Kang Donghun committed Nov 11, 2022
  
  5176e72b Browse Files
- ファイルの場所修正 · ccf17b4b
  Takumi Imai committed Nov 11, 2022
  
  ccf17b4b Browse Files
- 不要なファイルを削除 · 78fe288c
  Takumi Imai committed Nov 11, 2022
  
  78fe288c Browse Files
- index.htmlデザイン修正 · e96a7e8f
  Takumi Imai committed Nov 11, 2022
  
  e96a7e8f Browse Files
- 作業一覧のソートのバグ · c07c3773
  Takumi Imai committed Nov 11, 2022
  
  c07c3773 Browse Files
- operationLIstを保存したら変更された箇所 · 7eb6a437
  Takumi Imai committed Nov 11, 2022
  
  7eb6a437 Browse Files
- ヘッダーの位置調整 · 82dda087
  Takumi Imai committed Nov 11, 2022
  
  82dda087 Browse Files
- 報告(回答) · 8394da4d
  Takumi Imai committed Nov 11, 2022
  
  8394da4d Browse Files