Commits · 79ca3bbd5eaee72b7547b515253d34181b0ed8fa · abook_web / check · GitLab

15 Nov, 2022 6 commits
- ローディング修正 · 79ca3bbd
  Kang Donghun committed Nov 15, 2022
  
  79ca3bbd Browse Files
- コード整理、トークン処理追加 · f0c78053
  Kang Donghun committed Nov 15, 2022
  
  f0c78053 Browse Files
- Merge branch 'feature/1.0_check_web_dev' into feature/1.0_check_web_dev_kdh_2 · 4d55b513
```
# Conflicts:
#	abweb/js/reportForm/reportForm.js
```
  Kang Donghun committed Nov 15, 2022
  4d55b513 Browse Files
- Merge branch 'feature/1.0_check_web_dev_kdh_2' of… · 7be8766b
```
Merge branch 'feature/1.0_check_web_dev_kdh_2' of gitlab.agentec.jp:abook_web/check into feature/1.0_check_web_dev_kdh_2

# Conflicts:
#	abweb/js/reportList/reportList.js
```
  Kang Donghun committed Nov 15, 2022
  7be8766b Browse Files
- パンくずボタン修正 · 88a663f9
  Kang Donghun committed Nov 15, 2022
  
  88a663f9 Browse Files
- Merge branch 'feature/1.0_check_web_dev_imai' into 'feature/1.0_check_web_dev' · d434b3ce
```
テスト

See merge request !57
```
  Kang Donghun committed Nov 15, 2022
  d434b3ce Browse Files
14 Nov, 2022 30 commits
- テスト · ed9a5f33
  Takumi Imai committed Nov 15, 2022
  
  ed9a5f33 Browse Files
- Merge branch 'feature/1.0_check_web_dev' into 'feature/1.0_check_web_dev_kdh_2' · 10c2cc5b
```
# Conflicts:
#   abweb/common/js/header.js
#   abweb/html/accountSetting.html
#   abweb/html/pickup.html
#   abweb/js/setting/settings.js
#   abweb/js/template/template.js
```
  Kang Donghun committed Nov 14, 2022
  10c2cc5b Browse Files
- ログ削除 · e70749f2
  Kang Donghun committed Nov 14, 2022
  
  e70749f2 Browse Files
- パンくずボタン実装 · f0e499fd
  Kang Donghun committed Nov 14, 2022
  
  f0e499fd Browse Files
- Merge branch 'feature/1.0_check_web_dev_imai' into 'feature/1.0_check_web_dev' · 60c59c01
```
Feature/1.0 check web dev imai

See merge request !55
```
  Kang Donghun committed Nov 14, 2022
  60c59c01 Browse Files
- Merge branch 'feature/1.0_check_web_dev' into feature/1.0_check_web_dev_imai · 77b91919
  Takumi Imai committed Nov 14, 2022
  
  77b91919 Browse Files
- #49772　レポートフォームローディング閉じるの場所変更 · f9a2e2b6
  Takumi Imai committed Nov 14, 2022
  
  f9a2e2b6 Browse Files
- Merge branch 'feature/1.0_check_web_dev_50298' into 'feature/1.0_check_web_dev' · baa071c3
```
Feature/1.0 check web dev 50298

See merge request !54
```
  Takumi Imai committed Nov 14, 2022
  baa071c3 Browse Files
- Merge branch 'feature/1.0_check_web_dev_50270' into 'feature/1.0_check_web_dev' · ff062f69
```
add loading when send message

See merge request !53
```
  Takumi Imai committed Nov 14, 2022
  ff062f69 Browse Files
- Merge branch 'feature/1.0_check_web_dev_50265' into 'feature/1.0_check_web_dev' · 6abaceb7
```
fix break line dashboard setting

See merge request !52
```
  Takumi Imai committed Nov 14, 2022
  6abaceb7 Browse Files
- Add sort select operation list · 01de0476
  NGO THI HONG committed Nov 14, 2022
  
  01de0476 Browse Files
- add lang send message success · 62f69245
  NGUYEN HOANG SON committed Nov 14, 2022
  
  62f69245 Browse Files
- Fix not show pickup title when not any item · 7e653b8b
  NGO THI HONG committed Nov 14, 2022
  
  7e653b8b Browse Files
- fix remove js/header/header.js · 1f40cf63
  NGUYEN HOANG SON committed Nov 14, 2022
  
  1f40cf63 Browse Files
- Merge branch 'feature/1.0_check_web_dev' into feature/1.0_check_web_dev_50270 · cffc39c9
```
# Conflicts:
#	abweb/html/sendMessage.html
```
  NGUYEN HOANG SON committed Nov 14, 2022
  cffc39c9 Browse Files
- fix break line dashboard setting · 4e1a08cc
  NGUYEN HOANG SON committed Nov 14, 2022
  
  4e1a08cc Browse Files
- #49772　アカウントパス　デザイン修正 · 234d6d68
  Takumi Imai committed Nov 14, 2022
  
  234d6d68 Browse Files
- Merge branch 'feature/1.0_check_web_dev_50298' into 'feature/1.0_check_web_dev' · 435de41a
```
Feature/1.0 check web dev 50298

See merge request !51
```
  Takumi Imai committed Nov 14, 2022
  435de41a Browse Files
- Update english language · 27ed0f3d
  NGO THI HONG committed Nov 14, 2022
  
  27ed0f3d Browse Files
- Fix bug breadcrumb pickup · e3c05b0a
  NGO THI HONG committed Nov 14, 2022
  
  e3c05b0a Browse Files
- Fix bug header icon active · f2f4c427
  NGO THI HONG committed Nov 14, 2022
  
  f2f4c427 Browse Files
- Merge branch 'feature/1.0_check_web_dev' into feature/1.0_check_web_dev_kdh_2 · f5a95910
```
# Conflicts:
#	abweb/common/js/header.js
#	abweb/html/pushMessageList.html
```
  Kang Donghun committed Nov 14, 2022
  f5a95910 Browse Files
- pull commit · 4c29f689
  Kang Donghun committed Nov 14, 2022
  
  4c29f689 Browse Files
- Merge branch 'feature/1.0_check_web_dev_imai' into 'feature/1.0_check_web_dev' · 6387ec20
```
修正

See merge request !50
```
  Kang Donghun committed Nov 14, 2022
  6387ec20 Browse Files
- 修正 · 4cb08e51
  Takumi Imai committed Nov 14, 2022
  
  4cb08e51 Browse Files
- 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 4 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