Commits · 41a2370ad77ceeff96c09c7f84b98ace9d2fe492 · abookCommunication / chat_webview

30 Sep, 2021 1 commit
- Merge branch 'develop' into debug/console_logs · 41a2370a
  Kim Peace committed Sep 30, 2021
  
  41a2370a Browse Files
29 Sep, 2021 1 commit
- Merge branch 'design/playground' into 'develop' · 6d49b7f4
```
QA対応：タブレット表示時のフッターメニュー幅を調整

See merge request !259
```
  Kim Peace committed Sep 29, 2021
  6d49b7f4 Browse Files
27 Sep, 2021 1 commit
- QA対応：タブレット表示時のフッターメニュー幅を調整 · aa997cd0
  藤川諒 committed Sep 27, 2021
  
  aa997cd0 Browse Files
17 Sep, 2021 2 commits
- Merge branch 'bug/coview_login' into 'develop' · b1a9a341
```
Added coview login retry process

See merge request !258
```
  Kim Peace committed Sep 17, 2021
  b1a9a341 Browse Files
- Added coview login retry process · 609724fb
  Kim Peace committed Sep 17, 2021
  
  609724fb Browse Files
13 Sep, 2021 4 commits
- Merge branch 'develop' into debug/console_logs · 053fd3bb
  Kim Peace committed Sep 13, 2021
  
  053fd3bb Browse Files
- Merge branch 'bug/#44347_host_change' into 'develop' · 9fdd2c5a
```
Fixed to select right person to hand over host permission

See merge request !257
```
  Kim Peace committed Sep 13, 2021
  9fdd2c5a Browse Files
- Fixed to select right person to hand over host permission · ff503788
  Kim Peace committed Sep 13, 2021
  
  ff503788 Browse Files
- Merge branch 'develop' into debug/console_logs · 554beef6
  Kim Peace committed Sep 13, 2021
  
  554beef6 Browse Files
12 Sep, 2021 1 commit
- Hotfix for retry join · 03ed6eb8
  Kim Peace committed Sep 12, 2021
  
  03ed6eb8 Browse Files
10 Sep, 2021 4 commits
- Merge branch 'develop' into debug/console_logs · 753fd644
```
# Conflicts:
#	public_new/js/views/collaboration/share-bind-button-action.js
#	public_new/js/views/collaboration/share.js
```
  Kim Peace committed Sep 10, 2021
  753fd644 Browse Files
- Hotfix enable video collaboration · 0e296d27
  Kim Peace committed Sep 10, 2021
  
  0e296d27 Browse Files
- Merge branch 'bug/#44359_es6_shim_' into 'develop' · ffbeec2e
```
Changed class to function for not to use es6

See merge request !256
```
  Kim Peace committed Sep 10, 2021
  ffbeec2e Browse Files
- Changed class to function for not to use es6 · 2622f6b8
  Kim Peace committed Sep 10, 2021
  
  2622f6b8 Browse Files
09 Sep, 2021 12 commits
- Merge branch 'bug/titlename' into 'develop' · c64b670e
```
Fixed head title live task yell to biz task yell

See merge request !255
```
  Kim Peace committed Sep 09, 2021
  c64b670e Browse Files
- Fixed head title live task yell to biz task yell · 5b2761b9
  Kim Peace committed Sep 10, 2021
  
  5b2761b9 Browse Files
- Merge branch 'bug/#44192_android_archive_autoplay' into 'develop' · cc07193c
```
Fixed not to autoplay archive contents

See merge request !254
```
  Kim Peace committed Sep 09, 2021
  cc07193c Browse Files
- Fixed not to autoplay archive contents · d535a9e3
  Kim Peace committed Sep 09, 2021
  
  d535a9e3 Browse Files
- Merge branch 'bug/#44334_recoding_related_in_collaboration' into 'develop' · 4c5587db
```
Bug/#44334 recoding related in collaboration

See merge request !253
```
  Kim Peace committed Sep 09, 2021
  4c5587db Browse Files
- Removed unused console log · 6e4381a0
  Kim Peace committed Sep 09, 2021
  
  6e4381a0 Browse Files
- Fixed collaboraiton stop recording for android · 42593f80
  Kim Peace committed Sep 09, 2021
  
  42593f80 Browse Files
- Merge branch 'bug/#44334_recoding_related_in_collaboration' into 'develop' · e3bbf38a
```
Fixed to wait to finish callboration for send recorded data

See merge request !252
```
  Kim Peace committed Sep 09, 2021
  e3bbf38a Browse Files
- Added dropped promise finish method · 567c9b9c
  Kim Peace committed Sep 09, 2021
  
  567c9b9c Browse Files
- Fixed to use promise instead of callback parameter · 3376f66b
  Kim Peace committed Sep 09, 2021
  
  3376f66b Browse Files
- Fixed to wait to finish callboration for send recorded data · 4d19a6c1
  Kim Peace committed Sep 09, 2021
  
  4d19a6c1 Browse Files
- Merge branch 'bug/#44334_recoding_related_in_collaboration' into debug/console_logs · db2d2706
  Kim Peace committed Sep 09, 2021
  
  db2d2706 Browse Files
08 Sep, 2021 8 commits
- Merge branch 'bug/#44062_push_message_related' into 'develop' · 9d625253
```
Fixed to invited to collaobariton user's room type to dm

See merge request !251
```
  Kim Peace committed Sep 08, 2021
  9d625253 Browse Files
- Fixed to invited to collaobariton user's room type to dm · 97e8af4a
  Kim Peace committed Sep 08, 2021
  
  97e8af4a Browse Files
- Merge branch 'bug/#44062_push_message_related' into debug/console_logs · 435d6dc8
```
# Conflicts:
#	public_new/js/views/collaboration/fermi-web-socket-message-handler.js
```
  Kim Peace committed Sep 08, 2021
  435d6dc8 Browse Files
- 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
```
  Kim Jinsung committed Sep 08, 2021
  ab9731a0 Browse Files
- Bug #44079【ABook… · 633fda6a
```
Bug #44079【ABook Communication】協業接続中にホストを一度切り替えて行ってから、参加者側でホストリクエストすると、「既にホストリクエストが実行中です。」アラート表示し、リクエストができない
```
  Kim Jinsung 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 2 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