Commits · bc3a9f61ac08d0965b48f1b5e3f1411ed177c244 · abookCheck / design · GitLab

23 Jul, 2021 2 commits
- Merge branch 'feature/1.4.0_lmk' into 'feature/1.4.0' · bc3a9f61
```
Feature/1.4.0 lmk

See merge request !4
```
  Lee Munkyeong committed Jul 23, 2021
  bc3a9f61 Browse Files
- ソート初期値変更、RFIDとバーコード関連修正 · 67359662
  Lee Munkyeong committed Jul 23, 2021
  
  67359662 Browse Files
21 Jul, 2021 3 commits
- RFID関連修正 · 9d257da9
  Lee Munkyeong committed Jul 21, 2021
  
  9d257da9 Browse Files
- Merge branch 'feature/#42693_rfid' into 'feature/1.4.0' · bc119407
```
#42693 rfid and barcode scan

See merge request !3
```
  Kim Peace committed Jul 21, 2021
  bc119407 Browse Files
- Fixed inden · df5d8282
  Kim Peace committed Jul 21, 2021
  
  df5d8282 Browse Files
20 Jul, 2021 3 commits
- Added call start scan and stop scan · 149dc606
  Kim Peace committed Jul 20, 2021
  
  149dc606 Browse Files
- 検索機能のJavascript化 · 77868961
  Lee Munkyeong committed Jul 20, 2021
  
  77868961 Browse Files
- ソート保存実装と更新ボタン追加 · 6000dac6
  Lee Munkyeong committed Jul 20, 2021
  
  6000dac6 Browse Files
19 Jul, 2021 4 commits
- Merge branch 'feature/1.4.0' of https://gitlab.agentec.jp/abookCheck/design into feature/1.4.0_lmk · dc13b2c3
  Lee Munkyeong committed Jul 19, 2021
  
  dc13b2c3 Browse Files
- 更新ボタン追加 · f1d01c02
  Lee Munkyeong committed Jul 19, 2021
  
  f1d01c02 Browse Files
- Merge branch 'feature/1.4.0_miura' into 'feature/1.4.0' · 715f9a96
```
Feature/1.4.0 miura

See merge request !2
```
  Takatoshi Miura committed Jul 19, 2021
  715f9a96 Browse Files
- Merge branch 'feature/1.4.0_lmk' into 'feature/1.4.0' · 52f7e3bd
```
Feature/1.4.0 lmk

See merge request !1
```
  Lee Munkyeong committed Jul 19, 2021
  52f7e3bd Browse Files
16 Jul, 2021 3 commits
- RFID連動作業 · 0a9dd91e
  Lee Munkyeong committed Jul 16, 2021
  
  0a9dd91e Browse Files
- 不要のファイル削除 · 8a479a47
  Lee Munkyeong committed Jul 16, 2021
  
  8a479a47 Browse Files
- RFIDボタン追加 · c6486df4
  Lee Munkyeong committed Jul 16, 2021
  
  c6486df4 Browse Files
14 Jul, 2021 1 commit
- 1.4.0_miura_ソート、カテゴリ、検索結果の保持 · c73738db
  Takatoshi Miura committed Jul 14, 2021
  
  c73738db Browse Files
09 Jul, 2021 1 commit
- Merge branch 'feature/1.4.0_lmk' into feature/1.4.0_miura · f8816789
  Takatoshi Miura committed Jul 09, 2021
  
  f8816789 Browse Files
07 Jul, 2021 1 commit
- リセットの時現在のカテゴリパス初期化 · 8f311eaa
  Lee Munkyeong committed Jul 07, 2021
  
  8f311eaa Browse Files
01 Jul, 2021 3 commits
- Merge commit '4a6c5f41' into feature/1.4.0_miura · c54a61ef
```
# Conflicts:
#	app/script/check.js
```
  Takatoshi Miura committed Jul 01, 2021
  c54a61ef Browse Files
- カテゴリーパンクズ対応 · 4a6c5f41
  Lee Munkyeong committed Jul 01, 2021
  
  4a6c5f41 Browse Files
- Merge commit 'c2efed99 ' into feature/1.4.0_miura · 8ebbf3df
  Takatoshi Miura committed Jul 01, 2021
  
  8ebbf3df Browse Files
30 Jun, 2021 8 commits
- やじるしが変わった時の幅調節 · c2efed99
  Lee Munkyeong committed Jun 30, 2021
  
  c2efed99 Browse Files
- カテゴリーCSS修正。 · 6322cad1
  Lee Munkyeong committed Jun 30, 2021
  
  6322cad1 Browse Files
- Merge commit '69ac8a3b ' into feature/1.4.0_miura · 5c020b94
  Takatoshi Miura committed Jun 30, 2021
  
  5c020b94 Browse Files
- カテゴリーの階層化対応 · 69ac8a3b
  Lee Munkyeong committed Jun 30, 2021
  
  69ac8a3b Browse Files
- 1.4.0_miura_iOSの検索機能を実装 · f68b6370
  Takatoshi Miura committed Jun 30, 2021
  
  f68b6370 Browse Files
- Merge branch 'feature/1.4.0_miura' of… · 93e724c5
```
Merge branch 'feature/1.4.0_miura' of https://gitlab.agentec.jp/abookCheck/design into feature/1.4.0_lmk
```
  Lee Munkyeong committed Jun 30, 2021
  93e724c5 Browse Files
- Conflict対応 · 20b9684d
  Lee Munkyeong committed Jun 30, 2021
  
  20b9684d Browse Files
- 1.4.0_miura_競合修正ミス · a23e94f1
  Takatoshi Miura committed Jun 30, 2021
  
  a23e94f1 Browse Files
29 Jun, 2021 5 commits
- Merge commit '50e2553c ' into feature/1.4.0_miura · e6cb63f9
  Takatoshi Miura committed Jun 29, 2021
  
  e6cb63f9 Browse Files
- Merge branch 'feature/1.4.0_lmk_category' of… · 50e2553c
```
Merge branch 'feature/1.4.0_lmk_category' of https://gitlab.agentec.jp/abookCheck/design into feature/1.4.0_lmk

# Conflicts:
#	app/script/check.js
```
  Lee Munkyeong committed Jun 29, 2021
  50e2553c Browse Files
- カテゴリー検索対応 · b490414d
  Lee Munkyeong committed Jun 29, 2021
  
  b490414d Browse Files
- Merge commit '1dc0cccc' into feature/1.4.0_miura · 87292941
```
# Conflicts:
#	app/index.html
#	app/script/check.js
```
  Takatoshi Miura committed Jun 29, 2021
  87292941 Browse Files
- 検索対応 · 1dc0cccc
  Lee Munkyeong committed Jun 29, 2021
  
  1dc0cccc Browse Files
28 Jun, 2021 5 commits
- 1.4.0_miura_iOSの作業一覧対応(Json連動) · fa9227de
  Takatoshi Miura committed Jun 28, 2021
  
  fa9227de Browse Files
- 作業検索及びソート対応 · 773ca169
  Lee Munkyeong committed Jun 28, 2021
  
  773ca169 Browse Files
- 検索機能実装 · afcf3947
  Lee Munkyeong committed Jun 28, 2021
  
  afcf3947 Browse Files
- Merge commit '49cc7d88 ' into feature/1.4.0_miura · 58e6e236
  Takatoshi Miura committed Jun 28, 2021
  
  58e6e236 Browse Files
- iosデータ送受信用js追加 · 58a385ea
  Takatoshi Miura committed Jun 28, 2021
  
  58a385ea Browse Files
25 Jun, 2021 1 commit
- アンドロイド対応 · 49cc7d88
  Lee Munkyeong committed Jun 25, 2021
  
  49cc7d88 Browse Files