Commits · 62fbf72b96531d719d9c8fa35a2a8758ab3ea7a5 · abookCommunication / chat_webview · GitLab

27 May, 2021 1 commit
- サーバにエンコードした動画を送信したら削除する処理実装 · 62fbf72b
  Lee Munkyeong committed May 27, 2021
  
  62fbf72b Browse Files
26 May, 2021 2 commits
- 動画エンコード実装 · deb1f3e2
  Lee Munkyeong committed May 26, 2021
  
  deb1f3e2 Browse Files
- 動画エンコード実装 · 5405f280
  Lee Munkyeong committed May 26, 2021
  
  5405f280 Browse Files
24 May, 2021 14 commits
- Merge branch 'feature/develop_fix_collaboration_user_invitation_screen' into 'develop' · e23b43b5
```
Feature/develop fix collaboration user invitation screen

See merge request !140
```
  Lee Munkyeong committed May 24, 2021
  e23b43b5 Browse Files
- ホスト変更リクエスト機能追加。 · c6bec16c
  Lee Munkyeong committed May 24, 2021
  
  c6bec16c Browse Files
- Merge branch 'communication/ABCOMM-665_add-user-button' into 'develop' · 80cbdc71
```
[iOS] 協業でユーザー招待ボタンが表示されないバグを修正

See merge request !141
```
  Takatoshi Miura committed May 24, 2021
  80cbdc71 Browse Files
- 協業参加ユーザーリストが入場順で表示されるように修正。 · 4151b7fe
  Lee Munkyeong committed May 24, 2021
  
  4151b7fe Browse Files
- ABCOMM-665_add-user-button_協業でユーザー招待ボタンが表示されないバグを修正 · 7f8ba1d9
  Takatoshi Miura committed May 24, 2021
  
  7f8ba1d9 Browse Files
- インデント修正 · 3ec6bfc8
  Lee Munkyeong committed May 24, 2021
  
  3ec6bfc8 Browse Files
- ルームが存在しない場合のアラート追加。 · 9312b95f
  Lee Munkyeong committed May 24, 2021
  
  9312b95f Browse Files
- インデント修正 · 83beca84
  Lee Munkyeong committed May 24, 2021
  
  83beca84 Browse Files
- タブレットで協業ユーザー招待画面が正常に表示されるように修正 · fc8f8e7a
  Lee Munkyeong committed May 24, 2021
  
  fc8f8e7a Browse Files
- Merge branch 'feature/develop_end_recording_on_change_host_and_collaboration' into 'develop' · a2b19785
```
協業切替、ホスト変更の時レコードが終了されるように修正

See merge request !139
```
  Lee Munkyeong committed May 24, 2021
  a2b19785 Browse Files
- Merge branch 'develop' of gitlab.agentec.jp:abookCommunication/chat_webview into… · 4fd19108
```
Merge branch 'develop' of gitlab.agentec.jp:abookCommunication/chat_webview into feature/develop_end_recording_on_change_host_and_collaboration

# Conflicts:
#	public_new/js/share.js
```
  Lee Munkyeong committed May 24, 2021
  4fd19108 Browse Files
- Merge branch 'feature/develop_reset_pen_status_on_change__host_and_collaboration' into 'develop' · f60f08a4
```
ホスト権限が更新された場合ペン状態をOFFにする

See merge request !138
```
  Lee Munkyeong committed May 24, 2021
  f60f08a4 Browse Files
- 協業切替、ホスト変更の時レコードが終了されるように修正 · 0e3f64a3
  Lee Munkyeong committed May 24, 2021
  
  0e3f64a3 Browse Files
- ホスト権限が更新された場合ペン状態をOFFにする · f5fd284e
  Lee Munkyeong committed May 24, 2021
  
  f5fd284e Browse Files
21 May, 2021 6 commits
- Merge branch 'communication/ABCOMM-663_ios_record' into 'develop' · 697b7184
```
ABCOMM-663_ios_record_iosレコード機能実装

See merge request !137
```
  Kim Peace committed May 21, 2021
  697b7184 Browse Files
- ABCOMM-663_ios_record_iosレコード機能実装 · 21cca38d
  Takatoshi Miura committed May 21, 2021
  
  21cca38d Browse Files
- コードミス修正。 · 52a90315
  Lee Munkyeong committed May 21, 2021
  
  52a90315 Browse Files
- Merge branch 'feature/android6以下の対応' into 'develop' · 2c6664a3
```
アンドロイド8以下バージョンでのアラート追加、キャプチャー機能修正

See merge request !135
```
  Lee Munkyeong committed May 21, 2021
  2c6664a3 Browse Files
- Merge branch 'develop' of gitlab.agentec.jp:abookCommunication/chat_webview into… · 8c3b7809
```
Merge branch 'develop' of gitlab.agentec.jp:abookCommunication/chat_webview into feature/android6以下の対応

# Conflicts:
#	public_new/js/share.js
```
  Lee Munkyeong committed May 21, 2021
  8c3b7809 Browse Files
- Android7以下のユーザにホスト権限を渡すときにアラート追加。 · 37760b25
  Lee Munkyeong committed May 21, 2021
  
  37760b25 Browse Files
20 May, 2021 9 commits
- Merge branch 'communication/AABCOMM-93_ios-change-collaboration' into 'develop' · 695e99dc
```
[iOS] 協業切り替え実装

See merge request !136
```
  Takatoshi Miura committed May 20, 2021
  695e99dc Browse Files
- ABCOMM-93_change-collaboration_[iOS] 協業切り替え実装 · 8c7e5a08
  Takatoshi Miura committed May 20, 2021
  
  8c7e5a08 Browse Files
- Merge branch 'develop' into communication/AABCOMM-93_ios-change-collaboration · 37d233f8
  Takatoshi Miura committed May 20, 2021
  
  37d233f8 Browse Files
- コードミス修正。 · bfa1639b
  Lee Munkyeong committed May 20, 2021
  
  bfa1639b Browse Files
- アンドロイド8以下バージョンでのアラート追加、キャプチャー機能修正 · bf51035b
  Lee Munkyeong committed May 20, 2021
  
  bf51035b Browse Files
- Merge branch 'feature/develop_capture_photo_in_video_collaboration' into 'develop' · 1a3ed19e
```
Feature/develop capture photo in video collaboration

See merge request !134
```
  Lee Munkyeong committed May 20, 2021
  1a3ed19e Browse Files
- コードレビュー対応。 · 6f3fe281
  Lee Munkyeong committed May 20, 2021
  
  6f3fe281 Browse Files
- キャプチャー機能実装 · 3cb4cff1
  Lee Munkyeong committed May 20, 2021
  
  3cb4cff1 Browse Files
- 画面キャプチャーリクエスト実装 · 7857f5fa
  Lee Munkyeong committed May 20, 2021
  
  7857f5fa Browse Files
19 May, 2021 6 commits
- AABCOMM-93_change-collaboration_[iOS] 協業切り替え実装中 · c1655865
  Takatoshi Miura committed May 19, 2021
  
  c1655865 Browse Files
- Merge branch 'feature/change_collaboration' into 'develop' · 0d218888
```
Feature/change collaboration

See merge request !133
```
  Lee Munkyeong committed May 19, 2021
  0d218888 Browse Files
- 協業切替API連動 · 33af738e
  Lee Munkyeong committed May 19, 2021
  
  33af738e Browse Files
- Merge branch 'communication/ABCOMM-654_pipMode' into 'develop' · e6968a62
```
[iOS]文書協業時のPIPモードを実装

See merge request !132
```
  Takatoshi Miura committed May 19, 2021
  e6968a62 Browse Files
- 文書協業への変換処理実装中 · 801775ea
  Lee Munkyeong committed May 19, 2021
  
  801775ea Browse Files
- ABCOMM-654_pipMode_協業中タップで全画面表示する処理を実装 · 68eecddf
  Takatoshi Miura committed May 19, 2021
  
  68eecddf Browse Files
18 May, 2021 2 commits
- ABCOMM-654_pipMode_pipボタンで協業画面が右下に縮小する処理を実装 · bdaf16a9
  Takatoshi Miura committed May 18, 2021
  
  bdaf16a9 Browse Files
- ABCOMM-76-協業転換実装中 · f4715177
  Lee Munkyeong committed May 18, 2021
  
  f4715177 Browse Files