Commits · 1a22f77a885a64979851001fa249c88514c268bf · abookCommunication / chat_webview · GitLab

18 Aug, 2021 14 commits
- 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 14 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
- #43695 ウェブソケットの送信方式変更 · 7299ec5f
  Kim Eunchul committed Aug 06, 2021
  
  7299ec5f Browse Files
- #43695 ウェブソケットの送信方式変更 · 958a5649
  Kim Eunchul committed Aug 06, 2021
  
  958a5649 Browse Files
- Fixed to handle arcoodian tapped event · 1b9da91b
  Kim Peace committed Aug 06, 2021
  
  1b9da91b Browse Files
- Merge branch 'develop' into debug/console_logs · 0f9aa6c2
```
# Conflicts:
#	public_new/js/views/collaboration/fermi-web-socket-bridge.js
```
  Kim Peace committed Aug 06, 2021
  0f9aa6c2 Browse Files
- Merge branch 'bug/start_document_collaboration' into 'develop' · f598d8fc
```
Fixed to use right meeting id

See merge request !224
```
  Kim Peace committed Aug 06, 2021
  f598d8fc Browse Files
- Fixed to use right meeting id · 9e738d87
  Kim Peace committed Aug 06, 2021
  
  9e738d87 Browse Files
- Added some more console log · 75156426
  Kim Peace committed Aug 06, 2021
  
  75156426 Browse Files
- Merge branch 'bug/#43889_namecard_and_favorite' into 'develop' · 2917675a
```
Fixed for contact and namecard for favorite

See merge request !223
```
  Kim Peace committed Aug 06, 2021
  2917675a Browse Files
- Merge branch 'bug/#43889_namecard_and_favorite' into debug/console_logs · 6fd316f9
```
# Conflicts:
#	public_new/js/views/collaboration/collaboration.js
#	public_new/js/views/collaboration/share-event-listener.js
#	public_new/js/views/contact/namecard.js
```
  Kim Peace committed Aug 06, 2021
  6fd316f9 Browse Files
05 Aug, 2021 2 commits
- Fixed for contact and namecard for favorite · 485b0deb
  Kim Peace committed Aug 06, 2021
  
  485b0deb Browse Files
- Added dismiss loading indicator for finish all collaboration · 0757186e
  Kim Peace committed Aug 05, 2021
  
  0757186e Browse Files