Commits · efaa553e2dd7ac6517b2df9c575a34b59e27067d · abook_web / check · GitLab

25 Nov, 2022 10 commits
- Merge branch 'feature/1.0_check_web_dev' into 'feature/1.0_check_web' · efaa553e
```
Feature/1.0 check web dev

See merge request !91
```
  Takumi Imai committed Nov 25, 2022
  efaa553e Browse Files
- Merge branch 'feature/1.0_check_web_dev_imai' into 'feature/1.0_check_web_dev' · a6e93273
```
多言語化　ログイン画面

See merge request !90
```
  Kang Donghun committed Nov 25, 2022
  a6e93273 Browse Files
- 多言語化　ログイン画面 · f4bc790a
  Takumi Imai committed Nov 25, 2022
  
  f4bc790a Browse Files
- Merge branch 'feature/1.0_check_web_dev_imai' into 'feature/1.0_check_web_dev' · 8137f46b
```
Feature/1.0 check web dev imai

See merge request !89
```
  Kang Donghun committed Nov 25, 2022
  8137f46b Browse Files
- Merge branch 'feature/1.0_check_web_dev' into feature/1.0_check_web_dev_imai · e5490a53
  Takumi Imai committed Nov 25, 2022
  
  e5490a53 Browse Files
- 課題113　ヘッダーの位置 · 318ef7dc
  Takumi Imai committed Nov 25, 2022
  
  318ef7dc Browse Files
- Merge branch 'feature/1.0_check_web_dev_kdh_2' into 'feature/1.0_check_web_dev' · 395d0781
```
multilingual support

See merge request !88
```
  Takumi Imai committed Nov 25, 2022
  395d0781 Browse Files
- multilingual support · 86693806
  Kang Donghun committed Nov 25, 2022
  
  86693806 Browse Files
- Merge branch 'feature/1.0_check_web_dev_imai' into 'feature/1.0_check_web_dev' · bd0b751c
```
課題113　ヘッダーの位置がずれる問題

See merge request !87
```
  Kang Donghun committed Nov 25, 2022
  bd0b751c Browse Files
- 課題113　ヘッダーの位置がずれる問題 · 4cfe17c1
  Takumi Imai committed Nov 25, 2022
  
  4cfe17c1 Browse Files
24 Nov, 2022 1 commit
- Merge branch 'feature/1.0_check_web_dev_50312' into 'feature/1.0_check_web_dev' · 2ce157d0
```
feature/1.0_check_web_dev_50312

See merge request !86
```
  Takumi Imai committed Nov 24, 2022
  2ce157d0 Browse Files
22 Nov, 2022 5 commits
- Fix bug null task key, reply no null of warning url · a73a012a
  NGO THI HONG committed Nov 22, 2022
  
  a73a012a Browse Files
- Merge branch 'feature/1.0_check_web_dev_kdh_2' into 'feature/1.0_check_web_dev' · e15b1f6e
```
fixed login memory option

See merge request !85
```
  Takumi Imai committed Nov 22, 2022
  e15b1f6e Browse Files
- Merge branch 'feature/1.0_check_web_dev_imai' into 'feature/1.0_check_web_dev' · 6f66a2eb
```
課題 96 タイミングによるIO帳票のぼたんIDの取得

See merge request !84
```
  Kang Donghun committed Nov 22, 2022
  6f66a2eb Browse Files
- fixed login memory option · f777747d
  Kang Donghun committed Nov 22, 2022
  
  f777747d Browse Files
- 課題 96 タイミングによるIO帳票のぼたんIDの取得 · 03f196e9
  Takumi Imai committed Nov 22, 2022
  
  03f196e9 Browse Files
21 Nov, 2022 5 commits
- Merge branch 'feature/1.0_check_web_dev_imai' into 'feature/1.0_check_web_dev' · 2954515b
```
Feature/1.0 check web dev imai

See merge request !83
```
  Kang Donghun committed Nov 21, 2022
  2954515b Browse Files
- レビュー対応 · 15b472cb
  Takumi Imai committed Nov 21, 2022
  
  15b472cb Browse Files
- 課題65　定期点検の遷移 · 1d2aefce
  Takumi Imai committed Nov 21, 2022
  
  1d2aefce Browse Files
- 課題59 定期点検　削除後戻らない問題 · 6d01bc08
  Takumi Imai committed Nov 21, 2022
  
  6d01bc08 Browse Files
- エラーメッセージ追加 · 68955d68
  Takumi Imai committed Nov 21, 2022
  
  68955d68 Browse Files
18 Nov, 2022 19 commits
- 課題 55 修正 · fc9edcc6
  Takumi Imai committed Nov 18, 2022
  
  fc9edcc6 Browse Files
- Merge branch 'feature/1.0_check_web_dev' into feature/1.0_check_web_dev_imai · 8c68d793
  Takumi Imai committed Nov 18, 2022
  
  8c68d793 Browse Files
- 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
- 課題55 定期点検の文字表示 · 8b3e1908
  Takumi Imai committed Nov 18, 2022
  
  8b3e1908 Browse Files
- 課題55 定期点検表示 · bfeb71eb
  Takumi Imai committed Nov 18, 2022
  
  bfeb71eb Browse Files
- 課題55 定期点検のタイトル表示 · 3675b30f
  Takumi Imai committed Nov 18, 2022
  
  3675b30f Browse Files
- Merge branch 'feature/1.0_check_web_dev' into feature/1.0_check_web_dev_imai · b95a5676
```
# Conflicts:
#	abweb/js/pickup/pickup.js
#	abweb/js/reportForm/reportForm.js
```
  Takumi Imai committed Nov 18, 2022
  b95a5676 Browse Files
- 課題55　定期点検時に定期機関がない · 820962d2
  Takumi Imai committed Nov 18, 2022
  
  820962d2 Browse Files
- ピックアップの画面遷移修正 · fa38b46c
  Takumi Imai committed Nov 18, 2022
  
  fa38b46c 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