Commits · b80e56dd655d32d0fde755e42493d924aeef4664 · abook_android / abook_check

08 Apr, 2021 7 commits
- Merge branch 'features/#42144_and_search' into 'features/abcomm_sp6' · b80e56dd
```
Features/#42144 and search

See merge request !98
```
  Lee Munkyeong committed Apr 08, 2021
  b80e56dd Browse Files
- Merge branch 'features/abcomm_sp6' into 'features/#42144_and_search' · 30c6da84
```
# Conflicts:
#   ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ShopMemberDao.java
```
  Lee Munkyeong committed Apr 08, 2021
  30c6da84 Browse Files
- Merge branch 'features/abcomm_sp6' of… · f45915ea
```
Merge branch 'features/abcomm_sp6' of https://gitlab.agentec.jp/abook_android/abook_check into features/#42144_and_search

# Conflicts:
#	ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ShopMemberDao.java
```
  Lee Munkyeong committed Apr 08, 2021
  f45915ea Browse Files
- Merge branch 'features/#434_video_play_in_room' into 'features/abcomm_sp6' · fc58818a
```
動画のフールスクリーンモード追加。

See merge request !97
```
  Lee Munkyeong committed Apr 08, 2021
  fc58818a Browse Files
- コードレビュー対応。 · ffe143bb
  Lee Munkyeong committed Apr 08, 2021
  
  ffe143bb Browse Files
- コードレビュー対応。 · b616c5b3
  Lee Munkyeong committed Apr 08, 2021
  
  b616c5b3 Browse Files
- コードレビュー対応。 · f70a5a8b
  Lee Munkyeong committed Apr 08, 2021
  
  f70a5a8b Browse Files
07 Apr, 2021 2 commits
- メッセージ検索修正。 · b76cffaf
  Lee Munkyeong committed Apr 07, 2021
  
  b76cffaf Browse Files
- 検索処理修正。 · ac7f1409
  Lee Munkyeong committed Apr 07, 2021
  
  ac7f1409 Browse Files
06 Apr, 2021 4 commits
- updated submodule commit · 6a0918a8
  Lee Munkyeong committed Apr 06, 2021
  
  6a0918a8 Browse Files
- Merge branch 'features/#42144_contact_screen' into 'features/abcomm_sp6' · f62306d9
```
検索履歴を削除。

See merge request !96
```
  Lee Munkyeong committed Apr 06, 2021
  f62306d9 Browse Files
- 検索履歴を削除。 · 358bb36b
  Lee Munkyeong committed Apr 06, 2021
  
  358bb36b Browse Files
- Updated submodule commit · fd952ffe
  Kim Peace committed Apr 06, 2021
  
  fd952ffe Browse Files
05 Apr, 2021 1 commit
- 動画のフールスクリーンモード追加。 · 842169d8
  Lee Munkyeong committed Apr 05, 2021
  
  842169d8 Browse Files
02 Apr, 2021 7 commits
- updated submodule commit · d71afac6
  Kim Peace committed Apr 02, 2021
  
  d71afac6 Browse Files
- Merge commit '37ce0f52' into features/abcomm_sp5 · 6e0f3482
```
# Conflicts:
#	gradle.properties
```
  Kim Peace committed Apr 02, 2021
  6e0f3482 Browse Files
- Merge branch 'features/abcomm_sp5_chat_UI' into 'features/abcomm_sp5' · e8258333
```
Features/abcomm sp5 chat ui

See merge request !95
```
  Lee Munkyeong committed Apr 02, 2021
  e8258333 Browse Files
- コメント追加。 · d1d19fdf
  Lee Munkyeong committed Apr 02, 2021
  
  d1d19fdf Browse Files
- バグ修正。 · 3b1884d9
  Lee Munkyeong committed Apr 02, 2021
  
  3b1884d9 Browse Files
- チャット非表示追加。 · 24332b62
  Lee Munkyeong committed Apr 02, 2021
  
  24332b62 Browse Files
- invite-user · d54d0f7e
  Lee Munkyeong committed Apr 02, 2021
  
  d54d0f7e Browse Files
01 Apr, 2021 5 commits
- Merge branch 'features/abcomm_sp5_chat_UI' of… · ea4909b8
```
Merge branch 'features/abcomm_sp5_chat_UI' of gitlab.agentec.jp:abook_android/abook_check into features/abcomm_sp5_chat_UI

# Conflicts:
#	ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
```
  Kang Donghun committed Apr 01, 2021
  ea4909b8 Browse Files
- CreateRoomUI適用 · 74da67a1
  Kang Donghun committed Apr 01, 2021
  
  74da67a1 Browse Files
- Merge branch 'features/abcomm_sp5' into 'features/abcomm_sp5_chat_UI' · acc21972
```
# Conflicts:
#   ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/CommunicationLogic.java
#   ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java
```
  Lee Munkyeong committed Apr 01, 2021
  acc21972 Browse Files
- conflict対応。 · 6b396084
  Lee Munkyeong committed Apr 01, 2021
  
  6b396084 Browse Files
- メッセージ検索 · c4a8cda9
  Lee Munkyeong committed Apr 01, 2021
  
  c4a8cda9 Browse Files
31 Mar, 2021 2 commits
- ルーム名更新 · 712afa1f
  Lee Munkyeong committed Mar 31, 2021
  
  712afa1f Browse Files
- バグ修正。 · 349ec5cb
  Lee Munkyeong committed Mar 31, 2021
  
  349ec5cb Browse Files
30 Mar, 2021 1 commit
- Chat UI · b80b9811
  Lee Munkyeong committed Mar 30, 2021
  
  b80b9811 Browse Files
29 Mar, 2021 1 commit
- Merge branch 'features/abcomm_sp5_group_search_UI' into 'features/abcomm_sp5' · 8d3bc5b8
```
Features/abcomm sp5 group search ui

See merge request !94
```
  Lee Munkyeong committed Mar 29, 2021
  8d3bc5b8 Browse Files
26 Mar, 2021 2 commits
- コードレビュー対応。 · 9816e8e3
  Lee Munkyeong committed Mar 26, 2021
  
  9816e8e3 Browse Files
- getLoginParameter修正。 · 00d90361
  Lee Munkyeong committed Mar 26, 2021
  
  00d90361 Browse Files
25 Mar, 2021 5 commits
- コードレビュー対応。 · ec675abc
  Lee Munkyeong committed Mar 25, 2021
  
  ec675abc Browse Files
- チャット画面修正。 · 540a5369
  Lee Munkyeong committed Mar 25, 2021
  
  540a5369 Browse Files
- Merge branch 'features/abcomm_sp5' into 'features/abcomm_sp5_group_search_UI' · 8579b74d
```
# Conflicts:
#   ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ShopMemberDao.java
#   ABVJE_BL/src/jp/agentec/adf/net/http/HttpParameterObject.java
```
  Lee Munkyeong committed Mar 25, 2021
  8579b74d Browse Files
- コード整理 · 47e48b13
  Lee Munkyeong committed Mar 25, 2021
  
  47e48b13 Browse Files
- GroupAPI修正。 · c523a895
  Lee Munkyeong committed Mar 25, 2021
  
  c523a895 Browse Files
23 Mar, 2021 1 commit
- お気に入り、検索機能 · d7c71ca2
  Lee Munkyeong committed Mar 23, 2021
  
  d7c71ca2 Browse Files
22 Mar, 2021 1 commit
- お気に入りAPI移行 · 1164f170
  Lee Munkyeong committed Mar 22, 2021
  
  1164f170 Browse Files
17 Mar, 2021 1 commit
- Merge branch 'features/abcomm_sp3_contactUI' into 'features/abcomm_sp3' · c10ae0b2
```
Features/abcomm sp3 contact ui

See merge request !93
```
  Lee Munkyeong committed Mar 17, 2021
  c10ae0b2 Browse Files