Commits · 0b68532706783f6db5f72d1ac84ae980c1a553e3 · abookCommunication / chat_webview · GitLab

11 May, 2021 12 commits
- 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
- コード整理 · 48c54b77
  Kang Donghun committed May 11, 2021
  
  48c54b77 Browse Files
- ボード協業コード整理 · 1c871ee0
  Kang Donghun committed May 11, 2021
  
  1c871ee0 Browse Files
- ボード協業ボタン表示、disable追加、アラートが出力 · 462172c9
  Kang Donghun committed May 11, 2021
  
  462172c9 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 5 commits
- [iOS] 協業招待機能の追加実装 · 1cc4fb35
  Takatoshi Miura committed May 10, 2021
  
  1cc4fb35 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 7 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
- [ネームカード]の[音声通話]を押下すると、該当ユーザと[音声通話]を開始する · 265762bd
  Kang Donghun committed May 07, 2021
  
  265762bd Browse Files
- 協業招待UI修正 · ab27682b
  Lee Munkyeong committed May 07, 2021
  
  ab27682b Browse Files
06 May, 2021 6 commits
- ルーム名変更に空欄を非許可する。 · a3787e8a
  Lee Munkyeong committed May 06, 2021
  
  a3787e8a Browse Files
- Merge branch 'release_sp3' of gitlab.agentec.jp:abookCommunication/chat_webview into release_sp3 · 2a5914e5
```
# Conflicts:
#	public_new/js/chat-ui.js
```
  Kang Donghun committed May 06, 2021
  2a5914e5 Browse Files
- 協業内ユーザー招待機能実装 · 44d8dd9c
  Kang Donghun committed May 06, 2021
  
  44d8dd9c Browse Files
- Merge branch 'features/release_sp3_fix_list_css' into 'release_sp3' · de7a33d3
```
招待、ルーム開設リストUI修正

See merge request !108
```
  Lee Munkyeong committed May 06, 2021
  de7a33d3 Browse Files
- 招待、ルーム開設リストUI修正 · d1169b9e
  Lee Munkyeong committed May 06, 2021
  
  d1169b9e Browse Files
- Merge branch 'origin/apply_tasukeruUI' into 'release_sp3' · b3928856
```
ライブタスケルUIに修正

See merge request !107
```
  Takatoshi Miura committed May 06, 2021
  b3928856 Browse Files
30 Apr, 2021 6 commits
- ネームカードの通話ボタンを緑色に戻す · 9895f9a7
  Takatoshi Miura committed Apr 30, 2021
  
  9895f9a7 Browse Files
- ライブタスケルUIに修正 · 20ab706f
  Takatoshi Miura committed Apr 30, 2021
  
  20ab706f Browse Files
- Merge branch 'origin/ios_collaboration_fermi' into 'release_sp3' · 2db5fad0
```
ios協業機能を実装(FermiUI)

See merge request !106
```
  Takatoshi Miura committed Apr 30, 2021
  2db5fad0 Browse Files
- ios協業機能を実装(FermiUI) · f06837a8
  Takatoshi Miura committed Apr 30, 2021
  
  f06837a8 Browse Files
- Merge branch 'release_sp3_add_user' into 'release_sp3' · 6644d05e
```
Fermiサーバー側に協業ユーザーID追加実装

See merge request !105
```
  Kang Donghun committed Apr 30, 2021
  6644d05e Browse Files
- Fermiサーバー側に協業ユーザーID追加実装 · 2417f1bd
  Kang Donghun committed Apr 30, 2021
  
  2417f1bd Browse Files
28 Apr, 2021 4 commits
- Merge branch 'origin/archive_loading' into 'release_sp3' · d2a3c40e
```
アーカイブからチャット、コンタクト遷移時のローディングを追加

See merge request !102
```
  Kim Peace committed Apr 28, 2021
  d2a3c40e Browse Files
- Merge branch 'bugfix/modify-to-move-group-search-on-name-card' into 'release_sp3' · 8bc00b68
```
Bugfix/modify to move group search on name card

See merge request !103
```
  Kang Donghun committed Apr 28, 2021
  8bc00b68 Browse Files
- Merge branch 'features/change_collaboration_ui_to_fermi' into 'release_sp3' · e9717514
```
Features/change collaboration ui to fermi

See merge request !104
```
  Lee Munkyeong committed Apr 28, 2021
  e9717514 Browse Files
- メッセージ表示CSS修正 · bba8864f
  Lee Munkyeong committed Apr 28, 2021
  
  bba8864f Browse Files