Commits · 60bf6315bd02f50781e649742bbe7f89fcc56a46 · abook_web / check · GitLab

18 Nov, 2022 13 commits
- Merge branch 'feature/1.0_check_web_dev_son' into 'feature/1.0_check_web_dev' · 60bf6315
```
fix go to index page when dashboard home enabled

See merge request !82
```
  Takumi Imai committed Nov 18, 2022
  60bf6315 Browse Files
- fix go to index page when dashboard home enabled · 7b1ee577
  NGUYEN HOANG SON committed Nov 18, 2022
  
  7b1ee577 Browse Files
- Merge branch 'feature/1.0_check_web_dev_kdh_2' into 'feature/1.0_check_web_dev' · 5cc1db79
```
Add showLoading when init runs, delete unnecessary logs

See merge request !81
```
  Takumi Imai committed Nov 18, 2022
  5cc1db79 Browse Files
- Add showLoading when init runs, delete unnecessary logs · 8f7b8434
  Kang Donghun committed Nov 18, 2022
  
  8f7b8434 Browse Files
- Merge branch 'feature/1.0_check_web_dev_kdh_2' into 'feature/1.0_check_web_dev' · 7b353503
```
always display pdfprint button on reportForm

See merge request !80
```
  Takumi Imai committed Nov 18, 2022
  7b353503 Browse Files
- always display pdfprint button on reportForm · e8e4cdb0
  Kang Donghun committed Nov 18, 2022
  
  e8e4cdb0 Browse Files
- Merge branch 'feature/1.0_check_web_dev_kdh_2' into 'feature/1.0_check_web_dev' · 35d3b8c8
```
Feature/1.0 check web dev kdh 2

See merge request !79
```
  Takumi Imai committed Nov 18, 2022
  35d3b8c8 Browse Files
- fixed merge miss · f5a1e637
  Kang Donghun committed Nov 18, 2022
  
  f5a1e637 Browse Files
- fixed codes · c03b7d67
  Kang Donghun committed Nov 18, 2022
  
  c03b7d67 Browse Files
- Merge branch 'feature/1.0_check_web_dev_imai' into 'feature/1.0_check_web_dev' · 611a9940
```
Feature/1.0 check web dev imai

See merge request !78
```
  Kang Donghun committed Nov 18, 2022
  611a9940 Browse Files
- Merge branch 'feature/1.0_check_web_dev' into feature/1.0_check_web_dev_imai · 8c4ec6ae
```
# Conflicts:
#	abweb/common/js/common.js
#	abweb/html/reportForm.html
#	abweb/js/reportForm/reportForm.js
```
  Takumi Imai committed Nov 18, 2022
  8c4ec6ae Browse Files
- Merge branch 'feature/1.0_check_web_dev_kdh_2' into 'feature/1.0_check_web_dev' · 0639f7a5
```
add to display pdfPrint button

See merge request !77
```
  Takumi Imai committed Nov 18, 2022
  0639f7a5 Browse Files
- add to display pdfPrint button · 0f6a0704
  Kang Donghun committed Nov 18, 2022
  
  0f6a0704 Browse Files
17 Nov, 2022 23 commits
- ローディング · 58721861
  Takumi Imai committed Nov 17, 2022
  
  58721861 Browse Files
- Merge branch 'feature/1.0_check_web_dev' into feature/1.0_check_web_dev_imai · f1a599f0
  Takumi Imai committed Nov 17, 2022
  
  f1a599f0 Browse Files
- Merge branch 'feature/1.0_check_web_dev_kdh_2' into 'feature/1.0_check_web_dev' · 739e1686
```
Feature/1.0 check web dev kdh 2

See merge request !76
```
  Takumi Imai committed Nov 17, 2022
  739e1686 Browse Files
- erased unused code · ec8adfde
  Kang Donghun committed Nov 17, 2022
  
  ec8adfde Browse Files
- solved comflict · 7ecf8186
  Kang Donghun committed Nov 17, 2022
  
  7ecf8186 Browse Files
- フォームからの画面遷移 · 9013b5bd
  Takumi Imai committed Nov 17, 2022
  
  9013b5bd Browse Files
- ローディング画面 · 1f4f6660
  Takumi Imai committed Nov 17, 2022
  
  1f4f6660 Browse Files
- Merge branch 'feature/1.0_check_web_dev' into feature/1.0_check_web_dev_kdh_2 · 1e6896ae
  Kang Donghun committed Nov 17, 2022
  
  1e6896ae Browse Files
- Merge branch 'feature/1.0_check_web_dev_50312' into 'feature/1.0_check_web_dev' · 06a043a0
```
feature/1.0_check_web_dev_50312

See merge request !75
```
  Takumi Imai committed Nov 17, 2022
  06a043a0 Browse Files
- add test log · 11bba304
  Kang Donghun committed Nov 17, 2022
  
  11bba304 Browse Files
- add test log · 69b41b43
  Kang Donghun committed Nov 17, 2022
  
  69b41b43 Browse Files
- Fix bug load pickup title · 8ee3db0f
  NGO THI HONG committed Nov 17, 2022
  
  8ee3db0f Browse Files
- 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 4 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