Commits · 8d88d0f92ef82d1bee96ebf40589fb6d07f30917 · abook_android / abook_check

11 Sep, 2021 1 commit

Merge branch 'communication/develop_44078' into 'communication/develop' · 8d88d0f9

#44078 文書協業接続時にホスト切り替え要求した場合、Android端末のみPIPモード時にその画面に要求ダイアログ表示し、全画面表示できない

See merge request !223

committed Sep 11, 2021

8d88d0f9 Browse Files

10 Sep, 2021 7 commits
- #44078 文書協業接続時にホスト切り替え要求した場合、Android端末のみPIPモード時にその画面に要求ダイアログ表示し、全画面表示できない · c9363234
  onuma committed Sep 10, 2021
  
  c9363234 Browse Files
- Updated submodule commit · 498bb2f8
  Kim Peace committed Sep 10, 2021
  
  498bb2f8 Browse Files
- Merge branch 'communication/develop_44068' into 'communication/develop' · 99424cef
```
タスクが残らないように修正

See merge request !220
```
  onuma committed Sep 10, 2021
  99424cef Browse Files
- Updated submodule commit · 71de575e
  Kim Peace committed Sep 10, 2021
  
  71de575e Browse Files
- Updated submodule commit · 1fcbc275
  Kim Peace committed Sep 10, 2021
  
  1fcbc275 Browse Files
- #44068 文書協業接続時にホストが終了した場合、Android端末のみPIPモード時にその画面にチャットルーム画面が表示 · e0c76faf
  onuma committed Sep 10, 2021
  
  e0c76faf Browse Files
- Merge branch 'communication/develop' into communication/develop_44068 · 3e35d71b
  onuma committed Sep 10, 2021
  
  3e35d71b Browse Files
09 Sep, 2021 2 commits
- chat submodule最新に変更 · 238c250f
  Kim Jinsung committed Sep 09, 2021
  
  238c250f Browse Files
- タスクが残らないように修正。 · 0760f0fc
  onuma committed Sep 09, 2021
  
  0760f0fc Browse Files
06 Sep, 2021 9 commits
- Merge branch 'communication/develop_kim-ec' into 'communication/develop' · 3ceba6c7
```
Communication/develop kim ec

See merge request !219
```
  Kim Eunchul committed Sep 06, 2021
  3ceba6c7 Browse Files
- 協業招待プッシュメッセージ方法変更 · 0f31ee16
  Kim Eunchul committed Sep 06, 2021
  
  0f31ee16 Browse Files
- 協業招待プッシュメッセージ方法変更 · c1cbc3ca
  Kim Eunchul committed Sep 06, 2021
  
  c1cbc3ca Browse Files
- 協業招待プッシュメッセージ方法変更 · ff749821
  Kim Eunchul committed Sep 06, 2021
  
  ff749821 Browse Files
- Updated submodule commit · 669cf9ef
  Kim Peace committed Sep 06, 2021
  
  669cf9ef Browse Files
- Merge commit 'd1eb0aa0' into communication/develop · ef288ede
```
# Conflicts:
#	ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
```
  Kim Peace committed Sep 06, 2021
  ef288ede Browse Files
- Merge branch 'communication/develop' into 'communication/develop_kim-ec' · 6c803151
```
Communication/develop

See merge request !218
```
  Kim Eunchul committed Sep 06, 2021
  6c803151 Browse Files
- Merge branch 'communication/develop_44357' into 'communication/develop' · 731b6188
```
#44357 コミュニケーションダイアログが、ボタン2回連続タップすると消えなくなる

See merge request !216
```
  onuma committed Sep 06, 2021
  731b6188 Browse Files
- #44357 コミュニケーションダイアログが、ボタン2回連続タップすると消えなくなる · 15ff14d4
  onuma committed Sep 06, 2021
  
  15ff14d4 Browse Files
02 Sep, 2021 8 commits
- アプリバージョン情報変更 · d1eb0aa0
  onuma committed Sep 02, 2021
  
  d1eb0aa0 Browse Files
- Merge branch 'develop' · ba9ec461
  onuma committed Sep 02, 2021
  
  ba9ec461 Browse Files
- Merge branch 'features/1.4.100_develop' into 'features/1.4.100' · 91980b05
```
Features/1.4.100 develop

See merge request !215
```
  Lee Munkyeong committed Sep 02, 2021
  91980b05 Browse Files
- 多言語対応 · ac90cc34
  Lee Munkyeong committed Sep 02, 2021
  
  ac90cc34 Browse Files
- update submodule · 756190cc
  Lee Munkyeong committed Sep 02, 2021
  
  756190cc Browse Files
- Merge branch 'features/1.4.100_develop' into 'features/1.4.100' · c76a851c
```
Features/1.4.100 develop

See merge request !214
```
  Lee Munkyeong committed Sep 02, 2021
  c76a851c Browse Files
- update submodule · 78b8dc12
  Lee Munkyeong committed Sep 02, 2021
  
  78b8dc12 Browse Files
- ベースファイルなし作業不具合修正 · e7d24405
  Lee Munkyeong committed Sep 02, 2021
  
  e7d24405 Browse Files
01 Sep, 2021 9 commits
- アプリバージョン情報変更 · ab3a2bd5
  onuma committed Sep 01, 2021
  
  ab3a2bd5 Browse Files
- Merge branch 'features/1.4.100_develop' into 'features/1.4.100' · 8ad7403d
```
データ更新の時ローディング表示修正

See merge request !213
```
  Lee Munkyeong committed Sep 01, 2021
  8ad7403d Browse Files
- データ更新の時ローディング表示修正 · 33b4f843
  Lee Munkyeong committed Sep 01, 2021
  
  33b4f843 Browse Files
- Merge branch 'features/1.4.100_develop' into 'features/1.4.100' · 4d42778f
```
ローディング表示修正

See merge request !212
```
  Lee Munkyeong committed Sep 01, 2021
  4d42778f Browse Files
- ローディング表示修正 · 1e2c86f9
  Lee Munkyeong committed Sep 01, 2021
  
  1e2c86f9 Browse Files
- Merge branch 'features/1.4.100_develop' into 'features/1.4.100' · 29a1c890
```
update submodule

See merge request !211
```
  Lee Munkyeong committed Sep 01, 2021
  29a1c890 Browse Files
- update submodule · ed0e0248
  Lee Munkyeong committed Sep 01, 2021
  
  ed0e0248 Browse Files
- Merge branch 'features/1.4.100_develop' into 'features/1.4.100' · 58bc0112
```
ローディング表示修正

See merge request !210
```
  Lee Munkyeong committed Sep 01, 2021
  58bc0112 Browse Files
- ローディング表示修正 · 54256409
  Lee Munkyeong committed Sep 01, 2021
  
  54256409 Browse Files
31 Aug, 2021 4 commits
- Merge branch 'features/1.4.100_develop' into 'features/1.4.100' · 99c6b374
```
ローディングバ修正。

See merge request !209
```
  Lee Munkyeong committed Aug 31, 2021
  99c6b374 Browse Files
- ローディングバ修正。 · ed7cb992
  Lee Munkyeong committed Aug 31, 2021
  
  ed7cb992 Browse Files
- Update Submodule · a0a1b730
  Lee Munkyeong committed Aug 31, 2021
  
  a0a1b730 Browse Files
- 例外処理修正 · 29b8f0b2
  Lee Munkyeong committed Aug 31, 2021
  
  29b8f0b2 Browse Files