Commits · 40d72c94fa0a88575a5e3bceaebbcd40583b4289 · abookCommunication / chat_webview · GitLab

14 May, 2021 2 commits
- コード整理 · 40d72c94
  Takatoshi Miura committed May 14, 2021
  
  40d72c94 Browse Files
- Merge commit '4f062177' into… · bc4fd237
```
Merge commit '4f062177' into origin/release_sp3_ios_collaboration_document

# Conflicts:
#	public_new/js/share.js
```
  Takatoshi Miura committed May 14, 2021
  bc4fd237 Browse Files
13 May, 2021 6 commits
- [iOS] 文書協業JS連携箇所実装 · f82ac7bd
  Takatoshi Miura committed May 13, 2021
  
  f82ac7bd Browse Files
- Merge commit '239d9c72' into… · e8a6082a
```
Merge commit '239d9c72' into origin/release_sp3_ios_collaboration_document
```
  Takatoshi Miura committed May 13, 2021
  e8a6082a Browse Files
- Merge branch 'refactoring/host_chage_proposal' into 'develop' · 4f062177
```
Refactoring/host chage proposal

See merge request !119
```
  Lee Munkyeong committed May 13, 2021
  4f062177 Browse Files
- Added host request proposal · a0010776
  Kim Peace committed May 13, 2021
  
  a0010776 Browse Files
- Fixed share.js as javascript indent · 9f6b13cc
  Kim Peace committed May 13, 2021
  
  9f6b13cc Browse Files
- 文書協業実装 · 239d9c72
  Lee Munkyeong committed May 13, 2021
  
  239d9c72 Browse Files
11 May, 2021 21 commits
- [iOS] 文書協業連動箇所の実装 · d9af5309
  Takatoshi Miura committed May 11, 2021
  
  d9af5309 Browse Files
- Merge branch 'release_sp3_start_collaboration_message' into 'release_sp3' · 0af9fdc9
```
メッセージタイプ変数名修正

See merge request !117
```
  Kang Donghun committed May 11, 2021
  0af9fdc9 Browse Files
- メッセージタイプ変数名修正 · ecd30a54
  Kang Donghun committed May 11, 2021
  
  ecd30a54 Browse Files
- Merge branch 'features/release_sp3_collaboration_document' into 'release_sp3' · a1097bef
```
Features/release sp3 collaboration document

See merge request !115
```
  Lee Munkyeong committed May 11, 2021
  a1097bef Browse Files
- Merge branch 'release_sp3_white_board_collaboration' into 'release_sp3' · 0b685327
```
Release sp3 white board collaboration

See merge request !116
```
  Kang Donghun committed May 11, 2021
  0b685327 Browse Files
- コードレビュー対応。 · 4b957afe
  Lee Munkyeong committed May 11, 2021
  
  4b957afe Browse Files
- コード整理 · 48c54b77
  Kang Donghun committed May 11, 2021
  
  48c54b77 Browse Files
- ボード協業コード整理 · 1c871ee0
  Kang Donghun committed May 11, 2021
  
  1c871ee0 Browse Files
- 文書協業アラート表示 · 9f80c7ac
  Lee Munkyeong committed May 11, 2021
  
  9f80c7ac Browse Files
- ボード協業ボタン表示、disable追加、アラートが出力 · 462172c9
  Kang Donghun committed May 11, 2021
  
  462172c9 Browse Files
- Merge branch 'release_sp3' of gitlab.agentec.jp:abookCommunication/chat_webview… · a8ed1675
```
Merge branch 'release_sp3' of gitlab.agentec.jp:abookCommunication/chat_webview into features/release_sp3_collaboration_document

# Conflicts:
#	public_new/js/share.js
```
  Lee Munkyeong committed May 11, 2021
  a8ed1675 Browse Files
- 協業終了メソッドパラメータ修正 · 8da086e4
  Lee Munkyeong committed May 11, 2021
  
  8da086e4 Browse Files
- 文書協業実装 · 43f7dce7
  Lee Munkyeong committed May 11, 2021
  
  43f7dce7 Browse Files
- Merge branch 'release_sp3_start_collaboration_message' into 'release_sp3' · 7ffcdc67
```
Release sp3 start collaboration message

See merge request !114
```
  Kang Donghun committed May 11, 2021
  7ffcdc67 Browse Files
- Merge branch 'release_sp3_ios_invite_collaboration' into 'release_sp3' · 060b7c8c
```
[iOS] 協業招待機能の追加実装

See merge request !113
```
  Takatoshi Miura committed May 11, 2021
  060b7c8c Browse Files
- コード整理 · 911e6d38
  Kang Donghun committed May 11, 2021
  
  911e6d38 Browse Files
- 協業開始メッセージ表示修正 · 4d124b44
  Kang Donghun committed May 11, 2021
  
  4d124b44 Browse Files
- Merge branch 'release_sp3_host_exit_event' into 'release_sp3' · ca6ea671
```
ホストが協業を終了すると参加ユーザー全員の協業が終了されるように修正

See merge request !112
```
  Kang Donghun committed May 11, 2021
  ca6ea671 Browse Files
- Merge branch 'release_sp3' into 'release_sp3_host_exit_event' · b7873b7c
```
# Conflicts:
#   public_new/js/share.js
```
  Kang Donghun committed May 11, 2021
  b7873b7c Browse Files
- Merge branch 'release_sp3_add_user' into 'release_sp3' · cd102226
```
協業内ユーザー招待機能追加実装

See merge request !110
```
  Kang Donghun committed May 11, 2021
  cd102226 Browse Files
- レビューされた部分のコード修正 · a1e48b6f
  Kang Donghun committed May 11, 2021
  
  a1e48b6f Browse Files
10 May, 2021 6 commits
- [iOS] 協業招待機能の追加実装 · 1cc4fb35
  Takatoshi Miura committed May 10, 2021
  
  1cc4fb35 Browse Files
- 文書協業実装 · 6116448a
  Lee Munkyeong committed May 10, 2021
  
  6116448a Browse Files
- ホストが協業を終了すると参加ユーザー全員の協業が終了されるように修正 · 8cf6a392
  Kang Donghun committed May 10, 2021
  
  8cf6a392 Browse Files
- ルームタイプによって協業中にユーザー招待ボタンを非表示にするように修正 · 515433b6
  Kang Donghun committed May 10, 2021
  
  515433b6 Browse Files
- Merge branch 'release_sp3' into release_sp3_add_user · 0c51f3b9
  Kang Donghun committed May 10, 2021
  
  0c51f3b9 Browse Files
- Merge branch 'origin/namecard_collaboration' into 'release_sp3' · 124722a1
```
[iOS] ネームカードから音声協業を開始できるように修正

See merge request !111
```
  Takatoshi Miura committed May 10, 2021
  124722a1 Browse Files
07 May, 2021 5 commits
- [iOS] ネームカードから音声協業を開始できるように修正 · 3d379ad8
  Takatoshi Miura committed May 07, 2021
  
  3d379ad8 Browse Files
- 協業内ユーザー招待機能追加実装 · 3642add4
  Kang Donghun committed May 07, 2021
  
  3642add4 Browse Files
- Merge branch 'release_sp3' of gitlab.agentec.jp:abookCommunication/chat_webview into release_sp3 · 5ad65dc3
  Lee Munkyeong committed May 07, 2021
  
  5ad65dc3 Browse Files
- 協業ユーザ招待UI修正 · da93e20f
  Lee Munkyeong committed May 07, 2021
  
  da93e20f Browse Files
- Merge branch 'release_sp3_start_voice_from_name_card' into 'release_sp3' · 432339f5
```
[ネームカード]の[音声通話]を押下すると、該当ユーザと[音声通話]を開始する

See merge request !109
```
  Kang Donghun committed May 07, 2021
  432339f5 Browse Files