Commits · e513b18f221448f92396fb3fbcea3d2f33c6c14c · abook_android / abook_check · GitLab

23 Aug, 2021 4 commits
- temporary revert for chat webview xml · e513b18f
  Kim Peace committed Aug 23, 2021
  
  e513b18f Browse Files
- Fixed chatwebview2 to cgat webview · 1767cc7a
  Kim Peace committed Aug 23, 2021
  
  1767cc7a Browse Files
- Fixed merge function name · a0a7bb13
  Kim Peace committed Aug 23, 2021
  
  a0a7bb13 Browse Files
- Merge commit 'ad877e2d' into communication/merging_1_4_100 · 67e6d9b2
```
# Conflicts:
#	ABVJE_Launcher_Android/assets/chat
#	ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/OperationListActivity.java
#	ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/HTMLWebViewActivity.java
```
  Kim Peace committed Aug 23, 2021
  67e6d9b2 Browse Files
20 Aug, 2021 5 commits
- Merge branch 'feature/1.4.100_kim-ec' into 'features/1.4.100' · ad877e2d
```
#42998 I/O 帳票出力画面改善

See merge request !203
```
  Lee Munkyeong committed Aug 20, 2021
  ad877e2d Browse Files
- #42998 I/O 帳票出力画面改善 · beaf139b
  Kim Eunchul committed Aug 20, 2021
  
  beaf139b Browse Files
- update submodule · b7d64cd3
  Lee Munkyeong committed Aug 20, 2021
  
  b7d64cd3 Browse Files
- Merge branch 'communication/develop_onuma' into 'communication/develop' · adb49f48
```
バックグラウンドでプッシュメッセージ受信時の動作をiOSと同じにした。

See merge request !202
```
  onuma committed Aug 20, 2021
  adb49f48 Browse Files
- AppDefTypeに、loginId を追加した。 · 8f8d1e29
  onuma committed Aug 20, 2021
  
  8f8d1e29 Browse Files
19 Aug, 2021 1 commit
- バックグラウンドでプッシュメッセージ受信時の動作をiOSと同じにした。 · 8624f482
  onuma committed Aug 19, 2021
  
  8624f482 Browse Files
18 Aug, 2021 7 commits
- Merge branch 'feature/1.4.100_kim-ec' into 'features/1.4.100' · 57b164d9
```
#42998 I/O 帳票出力画面改善

See merge request !201
```
  Lee Munkyeong committed Aug 18, 2021
  57b164d9 Browse Files
- #42998 I/O 帳票出力画面改善 · ba2ea601
  Kim Eunchul committed Aug 18, 2021
  
  ba2ea601 Browse Files
- Merge branch 'feature/1.4.100_kim-ec' into 'features/1.4.100' · 5b43c518
```
#42998 I/O 帳票出力画面改善

See merge request !200
```
  Lee Munkyeong committed Aug 18, 2021
  5b43c518 Browse Files
- #42998 I/O 帳票出力画面改善 · 162a5702
  Kim Eunchul committed Aug 18, 2021
  
  162a5702 Browse Files
- Merge branch 'communication/develop_onuma' into 'communication/develop' · 9c9c14d1
```
#43368 AndroidとiOSで画面遷移を同じにした。

See merge request !199
```
  onuma committed Aug 18, 2021
  9c9c14d1 Browse Files
- showChatRoomPopupMessage関数を共通化した。 · 608d6491
  onuma committed Aug 18, 2021
  
  608d6491 Browse Files
- Merge branch 'communication/develop' into communication/develop_onuma · b113f1a2
  onuma committed Aug 18, 2021
  
  b113f1a2 Browse Files
17 Aug, 2021 1 commit
- updated chat submodule commit · 9f2a44fb
  Kim Peace committed Aug 17, 2021
  
  9f2a44fb Browse Files
15 Aug, 2021 1 commit
- displayPermissionFlg対応 · 00a05977
  Lee Munkyeong committed Aug 16, 2021
  
  00a05977 Browse Files
10 Aug, 2021 2 commits
- #43368 AndroidとiOSで画面遷移を同じにした。 · f4c426c5
  onuma committed Aug 10, 2021
  
  f4c426c5 Browse Files
- Updated submodule commit · 0010a51e
  Kim Peace committed Aug 10, 2021
  
  0010a51e Browse Files
06 Aug, 2021 4 commits
- Updated submodule commit · aaaccb43
  Kim Peace committed Aug 06, 2021
  
  aaaccb43 Browse Files
- Merge branch 'communication/bug/#43889_namecard_and_favorite' into 'communication/develop' · f0e958b9
```
Fixed to not hide name card when favorite add or removed

See merge request !198
```
  Kim Peace committed Aug 06, 2021
  f0e958b9 Browse Files
- Merge branch 'communication/develop_onuma' into 'communication/develop' · ad70fe02
```
#43368 文書協業中にプッシュメッセージからチャットルーム及びコラボレーション開始する時、チェックしてエラー表示する。

See merge request !197
```
  onuma committed Aug 06, 2021
  ad70fe02 Browse Files
- 遷移させないチェックの順番を、協業中、会議室中の順番に変更した。 · 1dca7c2a
  onuma committed Aug 06, 2021
  
  1dca7c2a Browse Files
05 Aug, 2021 8 commits
- Fixed to not hide name card when favorite add or removed · ab39aee0
  Peace committed Aug 06, 2021
  
  ab39aee0 Browse Files
- #43368 文書協業中にプッシュメッセージからチャットルーム及びコラボレーション開始する時、チェックしてエラー表示する。 · 862d7cbe
  onuma committed Aug 05, 2021
  
  862d7cbe Browse Files
- Update submodule · aa00b70b
  Lee Munkyeong committed Aug 05, 2021
  
  aa00b70b Browse Files
- Fixed to catch acms error for finish all collaboration action · 58027879
  Kim Peace committed Aug 05, 2021
  
  58027879 Browse Files
- Merge branch 'communication/develop_onuma' into 'communication/develop' · f916844c
```
遠隔支援（会議室）接続中には、プッシュメッセージを受信してもチャットに行かないように修正。

See merge request !195
```
  onuma committed Aug 05, 2021
  f916844c Browse Files
- 未使用の変数を削除した。 · 1880833b
  onuma committed Aug 05, 2021
  
  1880833b Browse Files
- Updated submodule commit · 3e4807ab
  Kim Peace committed Aug 05, 2021
  
  3e4807ab Browse Files
- Merge branch 'communication/feature/#43306_push_message_not_in_same_room' into… · e9ef8fa4
```
Merge branch 'communication/feature/#43306_push_message_not_in_same_room' into 'communication/develop'

Communication/feature/#43306 push message not in same room

See merge request !196
```
  Kim Peace committed Aug 05, 2021
  e9ef8fa4 Browse Files
04 Aug, 2021 6 commits
- Fixed not to display push notification for same chat room · a94c84ce
  Kim Peace committed Aug 05, 2021
  
  a94c84ce Browse Files
- Fixed hardcoding to final static · 25eadc52
  Kim Peace committed Aug 05, 2021
  
  25eadc52 Browse Files
- Updated submodule commit · 2bf4c869
  Kim Peace committed Aug 05, 2021
  
  2bf4c869 Browse Files
- 文言が間違っていたのを修正した。 · 99eceb75
  onuma committed Aug 04, 2021
  
  99eceb75 Browse Files
- 遠隔支援（会議室）接続中には、プッシュメッセージを受信してもチャットに行かないように修正。 · ac47e259
  onuma committed Aug 04, 2021
  
  ac47e259 Browse Files
- 新規文言リソース追加 · a1f1b4e5
  onuma committed Aug 04, 2021
  
  a1f1b4e5 Browse Files
03 Aug, 2021 1 commit
- Updated submodule commit · 62be22e8
  Kim Peace committed Aug 03, 2021
  
  62be22e8 Browse Files