Commits · 3d379ad8681c6fa0d1e95df953578a99226bf342 · abookCommunication / chat_webview · GitLab

07 May, 2021 6 commits
- [iOS] ネームカードから音声協業を開始できるように修正 · 3d379ad8
  Takatoshi Miura committed May 07, 2021
  
  3d379ad8 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 11 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
- コード整理 · 0e0b8e7f
  Kang Donghun committed Apr 28, 2021
  
  0e0b8e7f Browse Files
- チャットルーム内でネームカードのグループパスタップするとグループ検索画面に遷移されるように修正 · c47e0989
  Kang Donghun committed Apr 28, 2021
  
  c47e0989 Browse Files
- デザイン修正 · 2c3dfd56
  Lee Munkyeong committed Apr 28, 2021
  
  2c3dfd56 Browse Files
- デザイン修正 · 335685c1
  Lee Munkyeong committed Apr 28, 2021
  
  335685c1 Browse Files
- デザイン修正 · 71ad271e
  Lee Munkyeong committed Apr 28, 2021
  
  71ad271e Browse Files
- 協業UI変更 · 62d836e0
  Lee Munkyeong committed Apr 28, 2021
  
  62d836e0 Browse Files
- アーカイブからチャット、コンタクト遷移時のローディングを追加 · a5f829e5
```
Signed-off-by: Takatoshi-Miura <miura-t@agentec.jp>
```
  Takatoshi Miura committed Apr 28, 2021
  a5f829e5 Browse Files
26 Apr, 2021 11 commits
- バグ修正 · d0dd14b2
  Lee Munkyeong committed Apr 26, 2021
  
  d0dd14b2 Browse Files
- バグ修正 · 627e15b0
  Lee Munkyeong committed Apr 26, 2021
  
  627e15b0 Browse Files
- Merge branch 'release_sp3' of gitlab.agentec.jp:abookCommunication/chat_webview into release_sp3 · 8474f026
  Lee Munkyeong committed Apr 26, 2021
  
  8474f026 Browse Files
- 1:1通話ブロック · 69506ea0
  Lee Munkyeong committed Apr 26, 2021
  
  69506ea0 Browse Files
- Merge branch 'origin/ios_release' into 'release_sp3' · 134248d8
```
ios協業制限

See merge request !100
```
  Takatoshi Miura committed Apr 26, 2021
  134248d8 Browse Files
- インデント修正、協業ネームカード閉じるボタン位置修正 · 14505b01
  Kang Donghun committed Apr 26, 2021
  
  14505b01 Browse Files
- Merge branch 'features/realease_sp3_ready_for_realease' into 'release_sp3' · d412dadd
```
コードミス修正。

See merge request !101
```
  Lee Munkyeong committed Apr 26, 2021
  d412dadd Browse Files
- コードミス修正。 · 014a8b22
  Lee Munkyeong committed Apr 26, 2021
  
  014a8b22 Browse Files
- ios協業制限 · 1c5df485
  Takatoshi Miura committed Apr 26, 2021
  
  1c5df485 Browse Files
- Merge branch 'features/realease_sp3_ready_for_realease' into 'release_sp3' · 87e22d22
```
Features/realease sp3 ready for realease

See merge request !99
```
  Lee Munkyeong committed Apr 26, 2021
  87e22d22 Browse Files
- Merge branch 'release_sp3' of gitlab.agentec.jp:abookCommunication/chat_webview… · 0603f4dc
```
Merge branch 'release_sp3' of gitlab.agentec.jp:abookCommunication/chat_webview into features/realease_sp3_ready_for_realease

# Conflicts:
#	public_new/collaboration_picture.html
#	public_new/collaboration_video.html
#	public_new/collaboration_voice.html
#	public_new/js/share.js
```
  Lee Munkyeong committed Apr 26, 2021
  0603f4dc Browse Files