Commits · 8edcb9d5d863b521901f5ca94849e3134bb0398b · abook_web / check · GitLab

17 Nov, 2022 11 commits
- Merge branch 'feature/1.0_check_web_dev_son' into 'feature/1.0_check_web_dev' · 8edcb9d5
```
fix show alert function

See merge request !74
```
  Takumi Imai committed Nov 17, 2022
  8edcb9d5 Browse Files
- fix show alert function · 5a0faa8a
  NGUYEN HOANG SON committed Nov 17, 2022
  
  5a0faa8a Browse Files
- Merge branch 'feature/1.0_check_web_dev_kdh_2' into 'feature/1.0_check_web_dev' · f77d8b43
```
Reverting the function to display the pdfprint button

See merge request !73
```
  Takumi Imai committed Nov 17, 2022
  f77d8b43 Browse Files
- Reverting the function to display the pdfprint button · 4771234a
  Kang Donghun committed Nov 17, 2022
  
  4771234a Browse Files
- Merge branch 'feature/1.0_check_web_dev_kdh_2' into 'feature/1.0_check_web_dev' · 88802b88
```
edited logout button function and alert message on accountSetting screen

See merge request !71
```
  Takumi Imai committed Nov 17, 2022
  88802b88 Browse Files
- clean up codes · c23f327c
  Kang Donghun committed Nov 17, 2022
  
  c23f327c Browse Files
- Merge branch 'feature/1.0_check_web_dev_kdh_2' of… · 991a9a5d
```
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
```
  Kang Donghun committed Nov 17, 2022
  991a9a5d Browse Files
- add function that display pdfprint button on reportForm · df379163
  Kang Donghun committed Nov 17, 2022
  
  df379163 Browse Files
- Merge branch 'feature/1.0_check_web_dev' into 'feature/1.0_check_web_dev_kdh_2' · fb05b42e
```
# Conflicts:
#   abweb/common/js/header.js
#   abweb/common/json/lang/lang-en.json
#   abweb/common/json/lang/lang-ja.json
#   abweb/common/json/lang/lang-ko.json
#   abweb/js/setting/settings.js
```
  Kang Donghun committed Nov 17, 2022
  fb05b42e Browse Files
- Merge branch 'feature/1.0_check_web_dev_50312' into 'feature/1.0_check_web_dev' · 1aa9e820
```
Feature/1.0 check web dev 50312

See merge request !72
```
  Takumi Imai committed Nov 17, 2022
  1aa9e820 Browse Files
- Merge branch 'feature/1.0_check_web_dev_son' into 'feature/1.0_check_web_dev' · 9c26b25f
```
Feature/1.0 check web dev son

See merge request !70
```
  Takumi Imai committed Nov 17, 2022
  9c26b25f Browse Files
16 Nov, 2022 29 commits
- Add language onlyRfid to alert · 0d77ea42
  NGO THI HONG committed Nov 16, 2022
  
  0d77ea42 Browse Files
- fix timeout callback when close confirm modal · ff605114
  NGUYEN HOANG SON committed Nov 16, 2022
  
  ff605114 Browse Files
- fix show alert send message · 898bc7e7
  NGUYEN HOANG SON committed Nov 16, 2022
  
  898bc7e7 Browse Files
- edited logout button function and alert message on accountSetting screen · 296597ca
  Kang Donghun committed Nov 16, 2022
  
  296597ca Browse Files
- Merge branch 'feature/1.0_check_web_dev' into feature/1.0_check_web_dev_son · 46d74cad
```
# Conflicts:
#	abweb/common/json/lang/lang-en.json
#	abweb/common/json/lang/lang-ja.json
#	abweb/common/json/lang/lang-ko.json
```
  NGUYEN HOANG SON committed Nov 16, 2022
  46d74cad Browse Files
- Merge branch 'feature/1.0_check_web_dev_kdh_2' into 'feature/1.0_check_web_dev' · df5d8bd6
```
Feature/1.0 check web dev kdh 2

See merge request !69
```
  Takumi Imai committed Nov 16, 2022
  df5d8bd6 Browse Files
- edited callback on pdfprint · 734633c5
  Kang Donghun committed Nov 16, 2022
  
  734633c5 Browse Files
- Merge branch 'feature/1.0_check_web_dev_imai' into 'feature/1.0_check_web_dev' · 50a80364
```
作業一覧の日付エラー

See merge request !68
```
  Kang Donghun committed Nov 16, 2022
  50a80364 Browse Files
- upgrade showAlert function · c6de9971
  NGUYEN HOANG SON committed Nov 16, 2022
  
  c6de9971 Browse Files
- add validation check item on login screen · 5ef452a7
  Kang Donghun committed Nov 16, 2022
  
  5ef452a7 Browse Files
- fix confirm modal logout · 5a8177d7
  NGUYEN HOANG SON committed Nov 16, 2022
  
  5a8177d7 Browse Files
- 作業一覧の日付エラー · d973cbea
  Takumi Imai committed Nov 16, 2022
  
  d973cbea Browse Files
- 画面ロードタイミング変更 · efd8b2f8
  Kang Donghun committed Nov 16, 2022
  
  efd8b2f8 Browse Files
- Merge branch 'feature/1.0_check_web_dev' into feature/1.0_check_web_dev_kdh_2 · a3a9290c
  Kang Donghun committed Nov 16, 2022
  
  a3a9290c Browse Files
- loading screen resize · ec547922
  Kang Donghun committed Nov 16, 2022
  
  ec547922 Browse Files
- Merge branch 'feature/1.0_check_web_dev_kdh_2' into 'feature/1.0_check_web_dev' · e511043b
```
Feature/1.0 check web dev kdh 2

See merge request !67
```
  Takumi Imai committed Nov 16, 2022
  e511043b Browse Files
- Merge branch 'feature/1.0_check_web_dev_50312' into 'feature/1.0_check_web_dev' · ea7330b8
```
Feature/1.0 check web dev 50312

See merge request !66
```
  Takumi Imai committed Nov 16, 2022
  ea7330b8 Browse Files
- loading screen resize · 2bb880f8
  Kang Donghun committed Nov 16, 2022
  
  2bb880f8 Browse Files
- Merge branch 'feature/1.0_check_web_dev' into feature/1.0_check_web_dev_kdh_2 · 82715c6b
  Kang Donghun committed Nov 16, 2022
  
  82715c6b Browse Files
- loading screen resize · 1913fad6
  Kang Donghun committed Nov 16, 2022
  
  1913fad6 Browse Files
- Set DASHBOARD.defaultDashboard when dataDashboard be empty · 11b075be
  NGO THI HONG committed Nov 16, 2022
  
  11b075be Browse Files
- Merge branch 'feature/1.0_check_web_dev_son' into 'feature/1.0_check_web_dev' · 911e0efb
```
implement load confirm modal auto if elementId is null

See merge request !65
```
  Takumi Imai committed Nov 16, 2022
  911e0efb Browse Files
- change url to report list and delete unused log · 80510bf8
  Kang Donghun committed Nov 16, 2022
  
  80510bf8 Browse Files
- Change function displayAlert -> showAlert · bb9305e1
  NGO THI HONG committed Nov 16, 2022
  
  bb9305e1 Browse Files
- Update DASHBOARD.defaultDashboard · 3f96c2a0
  NGO THI HONG committed Nov 16, 2022
  
  3f96c2a0 Browse Files
- ローディング表示修正 · 953d3ece
  Kang Donghun committed Nov 16, 2022
  
  953d3ece Browse Files
- fixed to get addReportFlg · 2fd810a4
  Kang Donghun committed Nov 16, 2022
  
  2fd810a4 Browse Files
- Merge branch 'feature/1.0_check_web_dev' into feature/1.0_check_web_dev_kdh_2 · 6b6540e2
  Kang Donghun committed Nov 16, 2022
  
  6b6540e2 Browse Files
- implement load confirm modal auto if elementId is null · dae681ef
  NGUYEN HOANG SON committed Nov 16, 2022
  
  dae681ef Browse Files