Commits · a8e6659a5472b60ed3201941a579a1c28f79e071 · abookCommunication / chat_webview · GitLab

26 Aug, 2021 2 commits
- Merge from develop · a8e6659a
  Kim Peace committed Aug 26, 2021
  
  a8e6659a Browse Files
- Merge branch 'develop_kimjs' into 'develop' · 7bc455df
```
プッシュメッセージから文書協業接続時、関連資料画面表示問題と会議室接続問題対応

See merge request !237
```
  Kim Jinsung committed Aug 26, 2021
  7bc455df Browse Files
25 Aug, 2021 1 commit
- プッシュメッセージから文書協業接続時、関連資料画面表示問題と会議室接続問題対応 · a66f2fcd
  Kim Jinsung committed Aug 25, 2021
  
  a66f2fcd Browse Files
19 Aug, 2021 7 commits
- Merge branch 'bug/#43973_archive_list_searched_list_icon' into 'develop' · 910c8ea6
```
Fixed searched list icon in archive list

See merge request !236
```
  Kim Peace committed Aug 19, 2021
  910c8ea6 Browse Files
- Fixed searched list icon in archive list · a5d6a825
  Kim Peace committed Aug 19, 2021
  
  a5d6a825 Browse Files
- Merge branch 'bug/#43972_group_search_in_contact' into 'develop' · ac2e4a27
```
Fixed group search in contact

See merge request !235
```
  Kim Peace committed Aug 19, 2021
  ac2e4a27 Browse Files
- Fixed group search in contact · 1e16825d
  Kim Peace committed Aug 19, 2021
  
  1e16825d Browse Files
- Merge branch 'develop' into debug/console_logs · 86543671
  Kim Peace committed Aug 19, 2021
  
  86543671 Browse Files
- Merge branch 'bug/#43970_name_card_group_selected' into 'develop' · 04c71b37
```
Fixed to response namecard group

See merge request !234
```
  Kim Peace committed Aug 19, 2021
  04c71b37 Browse Files
- Fixed to response namecard group · b6a6c8de
  Kim Peace committed Aug 19, 2021
  
  b6a6c8de Browse Files
18 Aug, 2021 15 commits
- add on scroll console logs · 839c0cc5
  Kim Peace committed Aug 18, 2021
  
  839c0cc5 Browse Files
- Merge branch 'develop' into debug/console_logs · 1a22f77a
  Kim Peace committed Aug 18, 2021
  
  1a22f77a Browse Files
- Merge branch 'bug/#43953_user_list_in_chat_room' into 'develop' · e656af13
```
Bug/#43953 user list in chat room

See merge request !233
```
  Kim Peace committed Aug 18, 2021
  e656af13 Browse Files
- chat room user list display when not scroll needed · 40666e69
  Kim Peace committed Aug 18, 2021
  
  40666e69 Browse Files
- added console log for chat room on scroll · aba48fe7
  Kim Peace committed Aug 18, 2021
  
  aba48fe7 Browse Files
- Merge branch 'bug/#43953_user_list_in_chat_room' into debug/console_logs · c5d827b6
  Kim Peace committed Aug 18, 2021
  
  c5d827b6 Browse Files
- Fixed initial user list in chat room visible · 0862a8a3
  Kim Peace committed Aug 18, 2021
  
  0862a8a3 Browse Files
- Merge branch 'develop' into debug/console_logs · 177d3fa7
  Kim Peace committed Aug 18, 2021
  
  177d3fa7 Browse Files
- Merge branch 'bug/#43946_room_create_zero_selected' into 'develop' · f190b633
```
Bug/#43946 room create zero selected

See merge request !232
```
  Kim Peace committed Aug 18, 2021
  f190b633 Browse Files
- Removed console logs · abf0a41e
  Kim Peace committed Aug 18, 2021
  
  abf0a41e Browse Files
- Fixed to show loading indicator for inviate user screen loading and header ui fixed · cfc95f0a
  Kim Peace committed Aug 18, 2021
  
  cfc95f0a Browse Files
- Merge branch 'bug/#43946_room_create_zero_selected' into debug/console_logs · 1886ae14
  Kim Peace committed Aug 18, 2021
  
  1886ae14 Browse Files
- Fixed to display create room on create room search screen · 56f6dafa
  Kim Peace committed Aug 18, 2021
  
  56f6dafa Browse Files
- Merge branch 'bug/#43946_room_create_zero_selected' into debug/console_logs · c0ac2886
  Kim Peace committed Aug 18, 2021
  
  c0ac2886 Browse Files
- Fixed not to response 0 selected on create room · 8202c2de
  Kim Peace committed Aug 18, 2021
  
  8202c2de Browse Files
17 Aug, 2021 9 commits
- Merge branch 'bug/#43939_create_same_users_dm_room' into 'develop' · 8d05e556
```
Fixed to hide loading indicator when create room already exist and doesnt move to decided

See merge request !231
```
  Kim Peace committed Aug 17, 2021
  8d05e556 Browse Files
- Fixed to hide loading indicator when create room already exist and doesnt move to decided · 9163ccee
  Kim Peace committed Aug 17, 2021
  
  9163ccee Browse Files
- Merge branch 'develop' into debug/console_logs · b5dcec54
  Kim Peace committed Aug 17, 2021
  
  b5dcec54 Browse Files
- Merge branch 'bug/#43801_long_id_not_displated_on_ios' into 'develop' · e6f0908c
```
Fixed name card display too long id

See merge request !230
```
  Kim Peace committed Aug 17, 2021
  e6f0908c Browse Files
- Fixed name card display too long id · 6b0b87c5
  Kim Peace committed Aug 17, 2021
  
  6b0b87c5 Browse Files
- Merge branch 'develop' into debug/console_logs · 4a93dbdc
  Kim Peace committed Aug 17, 2021
  
  4a93dbdc Browse Files
- Merge branch 'bug/#43933_collaboration_invited_exit' into 'develop' · b9e820ee
```
Fixed collaobartion join type invited decide function

See merge request !229
```
  Kim Peace committed Aug 17, 2021
  b9e820ee Browse Files
- Fixed collaobartion join type invited decide function · 7a3405ba
  Kim Peace committed Aug 17, 2021
  
  7a3405ba Browse Files
- Merge branch 'bug/#43933_collaboration_invited_exit' into debug/console_logs · ae9826da
```
# Conflicts:
#	public_new/js/sockets/chat-websocket-message.js
```
  Kim Peace committed Aug 17, 2021
  ae9826da Browse Files
10 Aug, 2021 1 commit
- Merge branch 'squash/socket_kim-ec' into 'develop' · f1f47181
```
Squash/socket kim ec

See merge request !228
```
  Kim Peace committed Aug 10, 2021
  f1f47181 Browse Files
06 Aug, 2021 5 commits
- #43695 ウェブソケットの送信方式変更 · b4c29715
  Kim Eunchul committed Aug 06, 2021
  
  b4c29715 Browse Files
- Merge branch 'bugfix/#43905_arcoodians' into 'develop' · ca5452d0
```
Fixed to handle arcoodian tapped event

See merge request !225
```
  Kim Peace committed Aug 06, 2021
  ca5452d0 Browse Files
- #43695 ウェブソケットの送信方式変更 · 38cd9254
  Kim Eunchul committed Aug 06, 2021
  
  38cd9254 Browse Files
- Merge remote-tracking branch 'origin/develop' into squash/socket_kim-ec · 86d7f716
```
# Conflicts:
#	public_new/js/sockets/chat-websocket-message.js
```
  Kim Eunchul committed Aug 06, 2021
  86d7f716 Browse Files
- Merge remote-tracking branch 'origin/develop' into squash/socket_kim-ec · 2f805a11
  Kim Eunchul committed Aug 06, 2021
  
  2f805a11 Browse Files