Commits · f838f7ca80a7386f9cf9ce4396fba93b790118be · abookCommunication / chat_webview

08 Sep, 2021 5 commits

Merge branch 'bug/#44048_picture_select_on_picture_collaboration' into 'develop' · f838f7ca
```
Bug/#44048 picture select on picture collaboration

See merge request !249
```
Kim Peace committed Sep 08, 2021
f838f7ca Browse Files
Added some comments · 36acb182
Kim Peace committed Sep 08, 2021

36acb182 Browse Files

Merge branch 'develop_kimjs' into 'develop' · ab9731a0

Bug #44079【ABook Communication】協業接続中にホストを一度切り替えて行ってから、参加者側でホストリクエストすると、「既にホストリクエストが実行中です。」アラート表示し、リクエストができない

See merge request !250

committed Sep 08, 2021

ab9731a0 Browse Files

Bug #44079【ABook… · 633fda6a

Bug #44079【ABook Communication】協業接続中にホストを一度切り替えて行ってから、参加者側でホストリクエストすると、「既にホストリクエストが実行中です。」アラート表示し、リクエストができない

committed Sep 08, 2021

633fda6a Browse Files

Fixed Code styles · 01e4b615
Kim Peace committed Sep 08, 2021

01e4b615 Browse Files

07 Sep, 2021 4 commits
- Fixe some error for 44048 · bdea508c
  Kim Peace committed Sep 07, 2021
  
  bdea508c Browse Files
- Fixed to display picutre select dialog · 29d6b7b0
  Kim Peace committed Sep 07, 2021
  
  29d6b7b0 Browse Files
- Merge commit 'cbd17702' into… · 18ae1836
```
Merge commit 'cbd17702' into bug/#44048_picture_select_on_picture_collaboration
```
  Kim Peace committed Sep 07, 2021
  18ae1836 Browse Files
- Merge branch 'squash/socket_kim-ec' into 'develop' · cbd17702
```
【ABook Communication】通話終了しても通話終了されなく、「参加する」メッセージのままになる。

See merge request !248
```
  Kim Peace committed Sep 07, 2021
  cbd17702 Browse Files
06 Sep, 2021 5 commits
- 【ABook Communication】通話終了しても通話終了されなく、「参加する」メッセージのままになる。 · 7cdff7a7
  Kim Eunchul committed Sep 06, 2021
  
  7cdff7a7 Browse Files
- Merge branch 'bug/#44045_strings_in_collaboration_menu' into 'develop' · a3c8e7ed
```
Fixed 画像 to 写真, 音声 to 通話

See merge request !247
```
  Kim Peace committed Sep 06, 2021
  a3c8e7ed Browse Files
- Fixed 画像 to 写真, 音声 to 通話 · 418838c3
  Kim Peace committed Sep 06, 2021
  
  418838c3 Browse Files
- Merge branch 'bug/#44043_pen_document_collaboration' into 'develop' · 95001c9f
```
Removed pen and eraser icon on document collaboration pip screen

See merge request !246
```
  Kim Peace committed Sep 06, 2021
  95001c9f Browse Files
- Removed pen and eraser icon on document collaboration pip screen · 055c73b3
  Kim Peace committed Sep 06, 2021
  
  055c73b3 Browse Files
31 Aug, 2021 2 commits
- Merge branch 'develop_kimjs' into 'develop' · b7a57c25
```
問題点NO90対応

See merge request !245
```
  Kim Jinsung committed Aug 31, 2021
  b7a57c25 Browse Files
- 問題点NO90対応 · 168f1f57
```
参加者からホストリクエスト実行時に司会者でPIPモード終了してない状態でアラート表示で画面崩れ問題対応
```
  Kim Jinsung committed Aug 31, 2021
  168f1f57 Browse Files
30 Aug, 2021 8 commits
- Hotfix for collaboration type number converting · 0ab4d255
  Kim Peace committed Aug 30, 2021
  
  0ab4d255 Browse Files
- Merge branch 'develop' into bug/#44048_picture_select_on_picture_collaboration · e7dfd579
  Kim Peace committed Aug 30, 2021
  
  e7dfd579 Browse Files
- Added to exist collaboration camera permission not allowed · 7665fa80
  Kim Peace committed Aug 30, 2021
  
  7665fa80 Browse Files
- Merge branch 'bug/#44046_1on1_from_contact' into 'develop' · 3a8d2859
```
Bug/#44046 1on1 from contact

See merge request !244
```
  Kim Peace committed Aug 30, 2021
  3a8d2859 Browse Files
- Merge branch 'bug/#44044_caturep_button_on_change_collaboration' into 'develop' · db41fe42
```
Bug/#44044 caturep button on change collaboration

See merge request !243
```
  Kim Peace committed Aug 30, 2021
  db41fe42 Browse Files
- Merge branch 'bug/#44034_image_not_zoom_in_modal' into 'develop' · f13b7e89
```
add max height and width for picture modal

See merge request !242
```
  Kim Peace committed Aug 30, 2021
  f13b7e89 Browse Files
- Merge branch 'bug/#44051_archive_video_muted' into 'develop' · c0442a43
```
Not to be muted for archive movie content

See merge request !241
```
  Kim Peace committed Aug 30, 2021
  c0442a43 Browse Files
- Merge branch 'bug/offline' into 'develop' · 5d766b13
```
Bug/offline

See merge request !240
```
  Kim Peace committed Aug 30, 2021
  5d766b13 Browse Files
29 Aug, 2021 5 commits
- Fixed call from contact · 8aae5d00
  Kim Peace committed Aug 30, 2021
  
  8aae5d00 Browse Files
- Fixed to call from contact · 88fff62f
  Kim Peace committed Aug 30, 2021
  
  88fff62f Browse Files
- Fixed to display and hide capture picture button on collaboration · 94ddb32b
  Kim Peace committed Aug 29, 2021
  
  94ddb32b Browse Files
- Removed unused html files for collaboration change overlay menu · 6db82ab5
  Kim Peace committed Aug 29, 2021
  
  6db82ab5 Browse Files
- Fixed to remove participant name on collaboration screen · e0f9891c
  Kim Peace committed Aug 29, 2021
  
  e0f9891c Browse Files
28 Aug, 2021 5 commits
- Gave a space after colon · 5600af8f
  Kim Peace committed Aug 29, 2021
  
  5600af8f Browse Files
- Fixed to scale to fit on ipad size · e683ad2b
  Kim Peace committed Aug 29, 2021
  
  e683ad2b Browse Files
- add max height and width for picture modal · 0a1e6cd3
  Kim Peace committed Aug 29, 2021
  
  0a1e6cd3 Browse Files
- Not to be muted for archive movie content · 17d3b6c4
  Kim Peace committed Aug 29, 2021
  
  17d3b6c4 Browse Files
- Fixed to load profile image from db · 9959fead
  Kim Peace committed Aug 28, 2021
  
  9959fead Browse Files
27 Aug, 2021 6 commits
- Fixed to hide loading indicator when it back from offline · 52db6456
  Kim Peace committed Aug 27, 2021
  
  52db6456 Browse Files
- Merge branch 'bug/#44036_user_filtering_in_room_search' into 'develop' · 63262cab
```
Bug/#44036, #44037 user filtering in room search

See merge request !239
```
  Kim Peace committed Aug 27, 2021
  63262cab Browse Files
- Added clear checked mark on search user filter feature in chat room when cancel pressed · a8d989f2
  Kim Peace committed Aug 27, 2021
  
  a8d989f2 Browse Files
- Fixed check and get check user timing order · 56f8fddc
  Kim Peace committed Aug 27, 2021
  
  56f8fddc Browse Files
- Merge branch 'bug/#44032_send_picture_scroll' into 'develop' · 806d1193
```
Fixed scroll to bottom timing in message room when the new picture received from socket

See merge request !238
```
  Kim Peace committed Aug 27, 2021
  806d1193 Browse Files
- Fixed scroll to bottom timing in message room when the new picture received from socket · 8f53bd3a
  Kim Peace committed Aug 27, 2021
  
  8f53bd3a Browse Files