Commits · eb453f732e666ff251111b0e3a3562eb2d5abcf4 · abookCommunication / chat_webview · GitLab

18 May, 2021 2 commits
- 協業変換処理実装中 · eb453f73
  Lee Munkyeong committed May 18, 2021
  
  eb453f73 Browse Files
- サーバURL更新 · c8eb9b49
  Lee Munkyeong committed May 18, 2021
  
  c8eb9b49 Browse Files
17 May, 2021 15 commits
- Merge branch 'develop_change_collaboration' into 'develop' · 2fc3ca18
```
レコード、協業変更実装

See merge request !128
```
  Kim Peace committed May 17, 2021
  2fc3ca18 Browse Files
- Merge branch 'develop' into 'develop_change_collaboration' · 26680153
```
# Conflicts:
#   public_new/js/share.js
```
  Kim Peace committed May 17, 2021
  26680153 Browse Files
- Merge branch 'feature/release_sp3_finish_collaboration' into 'develop' · 0ef45e70
```
web-socketから届いたメッセージのmeetingID取得処理追加

See merge request !127
```
  Kang Donghun committed May 17, 2021
  0ef45e70 Browse Files
- レコード、協業変更実装 · 38efe21c
  Lee Munkyeong committed May 17, 2021
  
  38efe21c Browse Files
- fermiサーバーにLoginId登場されたことを判断するロジック追加 · f6c516bb
  Kang Donghun committed May 17, 2021
  
  f6c516bb Browse Files
- インデント修正 · c29af6de
  Kang Donghun committed May 17, 2021
  
  c29af6de Browse Files
- HostSearchメソッド追加 · a3f92984
  Kang Donghun committed May 17, 2021
  
  a3f92984 Browse Files
- Merge branch 'develop' of gitlab.agentec.jp:abookCommunication/chat_webview into develop · 6e7fcb8f
  Lee Munkyeong committed May 17, 2021
  
  6e7fcb8f Browse Files
- バグ修正 · 31af96e4
  Lee Munkyeong committed May 17, 2021
  
  31af96e4 Browse Files
- web-socketから届いたメッセージのmeetingID取得処理追加 · a663276b
  Kang Donghun committed May 17, 2021
  
  a663276b Browse Files
- Merge branch 'feature/release_sp3_finish_collaboration' into 'develop' · c9f64f94
```
[チャットルーム]のチャット履歴から現在協業が進行中なのか終了されたのか確認できる

See merge request !121
```
  Kim Peace committed May 17, 2021
  c9f64f94 Browse Files
- メニューポップアップ幅修正。 · d5dc4722
  Lee Munkyeong committed May 17, 2021
  
  d5dc4722 Browse Files
- Merge branch 'develop' into feature/release_sp3_finish_collaboration · 6f5976bc
```
# Conflicts:
#	public_new/js/share.js
#	public_new/template/template_open_collaboration_message.html
```
  Kang Donghun committed May 17, 2021
  6f5976bc Browse Files
- Merge branch 'feature/release_sp3_change_host_function' into 'develop' · abdaede6
```
ホスト変更機能実装

See merge request !122
```
  Kang Donghun committed May 17, 2021
  abdaede6 Browse Files
- Merge branch 'develop' into feature/release_sp3_change_host_function · d1dfba50
```
# Conflicts:
#	public_new/js/share.js
```
  Kang Donghun committed May 17, 2021
  d1dfba50 Browse Files
16 May, 2021 8 commits
- Merge branch 'origin/#605_namecard_group_path' into 'develop' · f84cf88a
```
[iOS] チャットルームのネームカードからグループに遷移する処理を実装

See merge request !125
```
  Takatoshi Miura committed May 16, 2021
  f84cf88a Browse Files
- Merge branch 'origin/release_sp3_ios_collaboration_document' into 'develop' · 29cc7d91
```
Origin/release sp3 ios collaboration document

See merge request !124
```
  Takatoshi Miura committed May 16, 2021
  29cc7d91 Browse Files
- Merge branch 'develop' into 'origin/release_sp3_ios_collaboration_document' · d2c2d2a7
```
# Conflicts:
#   public_new/js/share.js
```
  Takatoshi Miura committed May 16, 2021
  d2c2d2a7 Browse Files
- バグ修正 · 2e5836f0
  Lee Munkyeong committed May 16, 2021
  
  2e5836f0 Browse Files
- Merge branch 'develop_#414_board_collaboration' into 'develop' · d01e51c3
```
Develop #414 board collaboration

See merge request !126
```
  Lee Munkyeong committed May 16, 2021
  d01e51c3 Browse Files
- Merge branch 'develop' of gitlab.agentec.jp:abookCommunication/chat_webview into… · 7ed9412b
```
Merge branch 'develop' of gitlab.agentec.jp:abookCommunication/chat_webview into develop_#414_board_collaboration

# Conflicts:
#	public_new/js/share.js
```
  Lee Munkyeong committed May 16, 2021
  7ed9412b Browse Files
- Merge branch 'features/release_sp3_collaboration_document' into 'develop' · 6d876112
```
Features/release sp3 collaboration document

See merge request !120
```
  Lee Munkyeong committed May 16, 2021
  6d876112 Browse Files
- ボード協業実装 · 71dcd6ad
  Lee Munkyeong committed May 16, 2021
  
  71dcd6ad Browse Files
14 May, 2021 10 commits
- [iOS] チャットルームのネームカードからグループに遷移する処理を実装 · 11e84410
  Takatoshi Miura committed May 14, 2021
  
  11e84410 Browse Files
- ボード協業実装 · dd28d628
  Lee Munkyeong committed May 14, 2021
  
  dd28d628 Browse Files
- インデント修正 · bd429e25
  Takatoshi Miura committed May 14, 2021
  
  bd429e25 Browse Files
- コード整理 · 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
- Merge branch 'develop' into feature/release_sp3_change_host_function · a98c7d2c
```
# Conflicts:
#	public_new/js/share.js
```
  Kang Donghun committed May 14, 2021
  a98c7d2c Browse Files
- Merge branch 'develop' into feature/release_sp3_finish_collaboration · feb3f96a
```
# Conflicts:
#	public_new/js/share.js
```
  Kang Donghun committed May 14, 2021
  feb3f96a Browse Files
- コード整理 · 269efa35
  Lee Munkyeong committed May 14, 2021
  
  269efa35 Browse Files
- Merge branch 'develop' of gitlab.agentec.jp:abookCommunication/chat_webview into… · bd686d1e
```
Merge branch 'develop' of gitlab.agentec.jp:abookCommunication/chat_webview into features/release_sp3_collaboration_document

# Conflicts:
#	public_new/js/share.js
```
  Lee Munkyeong committed May 14, 2021
  bd686d1e Browse Files
- PIPメソッド修正。 · 8bda2e4c
  Lee Munkyeong committed May 14, 2021
  
  8bda2e4c Browse Files
13 May, 2021 5 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