Commits · bd0bd00befa17d739fb97d6ded5fb25131fd0232 · abook_android / abook_check · GitLab

28 Mar, 2019 1 commit
- Merge branch 'feature/1.0.1' into feature/1.0.1_33006 · bd0bd00b
  Jeong Gilmo committed Mar 28, 2019
  
  bd0bd00b Browse Files
27 Mar, 2019 2 commits
- Merge branch 'feature/1.0.1_32861' into 'feature/1.0.1' · b5e284ed
```
#32861 作業情報追加(Android)

See merge request !11
```
  Kim Jinsung committed Mar 27, 2019
  b5e284ed Browse Files
- Merge branch 'feature/1.0.1' into feature/1.0.1_33006 · b35eb4a4
  Jeong Gilmo committed Mar 27, 2019
  
  b35eb4a4 Browse Files
26 Mar, 2019 6 commits
- #33006 事業者毎のリソース多重化(Android) · 8d189837
```
- コメントの修正
```
  Jeong Gilmo committed Mar 26, 2019
  8d189837 Browse Files
- #32861 作業情報追加(Android) · a899f1c8
```
- 処理修正
```
  Jeong Gilmo committed Mar 26, 2019
  a899f1c8 Browse Files
- Merge branch 'feature/1.0.1_32861' into 'feature/1.0.1' · 167e720e
```
Feature/1.0.1 32861

See merge request !10
```
  Kim Jinsung committed Mar 26, 2019
  167e720e Browse Files
- #32861 作業情報追加(Android) · 7fe70099
```
- CMSと連携修正
- コメントの修正
```
  Jeong Gilmo committed Mar 26, 2019
  7fe70099 Browse Files
- #32861 作業情報追加(Android) · 0de8d451
```
- CMSと連携の修正
  画面遷移修正
```
  Jeong Gilmo committed Mar 26, 2019
  0de8d451 Browse Files
- #32861 作業情報追加(Android) · 01537e73
```
- CMSと連携の修正
```
  Jeong Gilmo committed Mar 26, 2019
  01537e73 Browse Files
25 Mar, 2019 5 commits
- #32861 作業情報追加(Android) · 0ff22555
```
- CMSと連携の修正
```
  Jeong Gilmo committed Mar 25, 2019
  0ff22555 Browse Files
- #33006 事業者毎のリソース多重化(Android) · 833fcf32
```
- APIと連携対応の修正
```
  Jeong Gilmo committed Mar 25, 2019
  833fcf32 Browse Files
- Merge branch 'feature/1.0.1' into feature/1.0.1_33006 · 99e0cbc2
  Jeong Gilmo committed Mar 25, 2019
  
  99e0cbc2 Browse Files
- #32861 作業情報追加(Android) · dd7aa92d
```
- CMSとの連携対応の修正
```
  Jeong Gilmo committed Mar 25, 2019
  dd7aa92d Browse Files
- #32861 作業情報追加(Android) · e99ccc62
```
- CMSとの連携部分の修正
```
  Jeong Gilmo committed Mar 25, 2019
  e99ccc62 Browse Files
24 Mar, 2019 2 commits
- Merge branch 'feature/1.0.1' into feature/1.0.1_32861 · 970ee001
  Jeong Gilmo committed Mar 24, 2019
  
  970ee001 Browse Files
- #32825 作業一覧画面改善 · 3493050a
  Lee Jaebin committed Mar 24, 2019
  
  3493050a Browse Files
22 Mar, 2019 1 commit
- #32825 作業一覧画面改善 · fcc8f297
  Lee Jaebin committed Mar 22, 2019
  
  fcc8f297 Browse Files
21 Mar, 2019 7 commits
- #32861 作業情報追加(Android) · e6064a7b
```
- 画像追加
```
  Jeong Gilmo committed Mar 21, 2019
  e6064a7b Browse Files
- #32861 作業情報追加(Android) · 5bb3133f
```
- 削除機能追加
- 画像追加
```
  Jeong Gilmo committed Mar 21, 2019
  5bb3133f Browse Files
- Merge branch 'feature/1.0.1' into feature/1.0.1_33006 · 30c2a398
  Jeong Gilmo committed Mar 21, 2019
  
  30c2a398 Browse Files
- #32825 作業一覧画面改善修正漏れ · 3144d053
  Lee Jaebin committed Mar 21, 2019
  
  3144d053 Browse Files
- Merge branch 'feature/1.0.1' into feature/1.0.1_33006 · ec42bc8b
```
# Conflicts:
#	ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
```
  Jeong Gilmo committed Mar 21, 2019
  ec42bc8b Browse Files
- #32825 作業一覧画面改善 · fa601572
  Lee Jaebin committed Mar 21, 2019
  
  fa601572 Browse Files
- #33006 事業者毎のリソース多重化(Android) · 2666dd82
  Jeong Gilmo committed Mar 21, 2019
  
  2666dd82 Browse Files
20 Mar, 2019 2 commits
- #32825 作業一覧画面改善 · 05b337ce
  Lee Jaebin committed Mar 20, 2019
  
  05b337ce Browse Files
- #33006 事業者毎のリソース多重化(Android) · 1525055a
  Jeong Gilmo committed Mar 20, 2019
  
  1525055a Browse Files
19 Mar, 2019 5 commits
- #32825 作業一覧画面改善 · 1d2780ad
  Lee Jaebin committed Mar 19, 2019
  
  1d2780ad Browse Files
- Merge branch 'feature/1.0.1' into feature/1.0.1_32825 · 04fde09d
```
# Conflicts:
#	ABVJE_BL/src/jp/agentec/abook/abv/bl/common/Constant.java
#	ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskReportDao.java
#	ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/OperationLogic.java
#	ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
```
  Lee Jaebin committed Mar 19, 2019
  04fde09d Browse Files
- #32825 作業一覧画面改善 · be91422e
  Lee Jaebin committed Mar 19, 2019
  
  be91422e Browse Files
- Merge branch 'feature/1.0.1_32926' into 'feature/1.0.1' · 2cac1130
```
Feature/1.0.1 32926

See merge request !8
```
  Kim Jinsung committed Mar 19, 2019
  2cac1130 Browse Files
- #32926 作業報告画面改善（Android） · 1bea882c
```
レビュー対応
```
  Jeong Gilmo committed Mar 19, 2019
  1bea882c Browse Files
18 Mar, 2019 5 commits
- #32825 作業一覧画面改善（Android）コミットミス修正 · c77c8c57
  Lee Jaebin committed Mar 18, 2019
  
  c77c8c57 Browse Files
- #32825 作業一覧画面改善（Android） · 4309bdca
  Lee Jaebin committed Mar 18, 2019
  
  4309bdca Browse Files
- #32926 作業報告画面改善（Android） · 9ac153e2
  Jeong Gilmo committed Mar 18, 2019
  
  9ac153e2 Browse Files
- ピンのサイズ調整 · 42f9b507
  Lee Jaebin committed Mar 18, 2019
  
  42f9b507 Browse Files
- FCMトークンを取得できない場合、noneIdでセットしてログインできるように修正 · 4c6164ae
  Lee Jaebin committed Mar 18, 2019
  
  4c6164ae Browse Files
15 Mar, 2019 1 commit
- #32926 作業報告画面改善（Android） · 94802da9
  Jeong Gilmo committed Mar 15, 2019
  
  94802da9 Browse Files
13 Mar, 2019 2 commits
- #32926 作業報告画面改善（Android） · a64f797a
  Jeong Gilmo committed Mar 13, 2019
  
  a64f797a Browse Files
- Merge branch 'feature/1.0.1_32861' into 'feature/1.0.1' · 4554093e
```
#32861 作業情報追加(Android)

See merge request !7
```
  Kim Jinsung committed Mar 13, 2019
  4554093e Browse Files
12 Mar, 2019 1 commit
- #32861 作業情報追加(Android) · a9297fa0
```
レビュー対応
```
  Jeong Gilmo committed Mar 12, 2019
  a9297fa0 Browse Files