Commits · 4b3813e4dd6341785c6aa7832f10f4496d3b61d5 · abookCommunication / chat_webview · GitLab

30 Aug, 2021 8 commits
- Merge branch 'bug/#44048_picture_select_on_picture_collaboration' into debug/console_logs · 4b3813e4
```
# Conflicts:
#	public_new/js/common/common.js
```
  Kim Peace committed Aug 30, 2021
  4b3813e4 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 7 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
- Fixe to display collabofaiton type log for show and hide host · 09c1a264
  Kim Peace committed Aug 29, 2021
  
  09c1a264 Browse Files
- Merge branch 'bug/#44044_caturep_button_on_change_collaboration' into debug/console_logs · d90c5699
  Kim Peace committed Aug 29, 2021
  
  d90c5699 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 7 commits
- Merge branch 'bug/#44034_image_not_zoom_in_modal' into debug/console_logs · 1c81cd72
  Peace committed Aug 29, 2021
  
  1c81cd72 Browse Files
- 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
- Merge branch 'bug/offline' into debug/console_logs · f05d15a2
  Kim Peace committed Aug 28, 2021
  
  f05d15a2 Browse Files
27 Aug, 2021 8 commits
- Fixed to hide loading indicator when it back from offline · 52db6456
  Kim Peace committed Aug 27, 2021
  
  52db6456 Browse Files
- Merge branch 'develop' into debug/console_logs · 5427d2f1
  Kim Peace committed Aug 27, 2021
  
  5427d2f1 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 'develop' into debug/console_logs · 79770beb
  Kim Peace committed Aug 27, 2021
  
  79770beb 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
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