Commits · 73b58bf151910bb23d93332f3cf0c617fab543ef · abookCommunication / chat_webview · GitLab

21 Apr, 2021 2 commits
- 文書協業 · 73b58bf1
  Lee Munkyeong committed Apr 21, 2021
  
  73b58bf1 Browse Files
- 文書協業 · 801b6e55
  Lee Munkyeong committed Apr 21, 2021
  
  801b6e55 Browse Files
20 Apr, 2021 3 commits
- 動画、音声協業実装 · 2db7333a
  Lee Munkyeong committed Apr 20, 2021
  
  2db7333a Browse Files
- 協業参加 · 4811d860
  Lee Munkyeong committed Apr 20, 2021
  
  4811d860 Browse Files
- 協業実装 · be06cf39
  Lee Munkyeong committed Apr 20, 2021
  
  be06cf39 Browse Files
19 Apr, 2021 2 commits
- 写真協業実装 · 4db50925
  Lee Munkyeong committed Apr 19, 2021
  
  4db50925 Browse Files
- Merge branch 'release_sp3' of gitlab.agentec.jp:abookCommunication/chat_webview… · 6638f5dd
```
Merge branch 'release_sp3' of gitlab.agentec.jp:abookCommunication/chat_webview into features/release_sp3_collaboration_picture

# Conflicts:
#	public_new/js/constant.js
```
  Lee Munkyeong committed Apr 19, 2021
  6638f5dd Browse Files
17 Apr, 2021 16 commits
- Merge branch 'origin/bugfix_chatroom' into 'release_sp3' · 5b59f0d6
```
Origin/bugfix chatroom

See merge request !66
```
  Takatoshi Miura committed Apr 17, 2021
  5b59f0d6 Browse Files
- Merge branch 'features/#577_ユーザ招待でメッセージを表示' into 'release_sp3' · 4970ca85
```
ユーザ招待で同じルームがあればポップアップを表示

See merge request !65
```
  Kim Peace committed Apr 17, 2021
  4970ca85 Browse Files
- アーカイブ詳細修正 · 67366ff4
  Takatoshi Miura committed Apr 17, 2021
  
  67366ff4 Browse Files
- ホームボタン処理 · 03162792
  Takatoshi Miura committed Apr 17, 2021
  
  03162792 Browse Files
- ルーム名変更処理実装 · 96d44102
  Takatoshi Miura committed Apr 17, 2021
  
  96d44102 Browse Files
- ユーザ招待で同じルームがあればポップアップを表示 · c1fa8f55
  Lee Munkyeong committed Apr 17, 2021
  
  c1fa8f55 Browse Files
- Merge branch 'features/#554_メッセージ検索するとリストの下部が見えない' into 'release_sp3' · 5e808b38
```
CSS修正

See merge request !63
```
  Lee Munkyeong committed Apr 17, 2021
  5e808b38 Browse Files
- Merge branch 'features/#574_全グループでお気に入りを登録すると自身情報セールが表示される' into 'release_sp3' · 3b660c5f
```
自身情報セールの位置修正

See merge request !64
```
  Lee Munkyeong committed Apr 17, 2021
  3b660c5f Browse Files
- Merge branch 'origin/#573_message' into 'release_sp3' · 41fff884
```
android追加修正分の適用

See merge request !62
```
  Takatoshi Miura committed Apr 17, 2021
  41fff884 Browse Files
- 自身情報セールの位置修正 · 57cf03d4
  Lee Munkyeong committed Apr 17, 2021
  
  57cf03d4 Browse Files
- 文言修正 · 3d74fed4
  Lee Munkyeong committed Apr 17, 2021
  
  3d74fed4 Browse Files
- CSS修正 · 06c13018
  Lee Munkyeong committed Apr 17, 2021
  
  06c13018 Browse Files
- アーカイブ修正 · 1234b73c
  Takatoshi Miura committed Apr 17, 2021
  
  1234b73c Browse Files
- Merge branch 'features/#552_タブーを変更すると既存参加者が招待リストに表示される。' into 'release_sp3' · 75fe9dfb
```
初対画面バグ修正

See merge request !61
```
  Lee Munkyeong committed Apr 17, 2021
  75fe9dfb Browse Files
- アーカイブ修正 · 9d0b6fe0
  Takatoshi Miura committed Apr 17, 2021
  
  9d0b6fe0 Browse Files
- 招待処理実装 · 4d75a288
  Takatoshi Miura committed Apr 17, 2021
  
  4d75a288 Browse Files
16 Apr, 2021 17 commits
- android修正分の適用 · 54452c9b
  Takatoshi Miura committed Apr 16, 2021
  
  54452c9b Browse Files
- 初対画面バグ修正 · a06fafcc
  Lee Munkyeong committed Apr 16, 2021
  
  a06fafcc Browse Files
- Merge branch 'features/#546_音声アーカイブのPlaceHolder' into 'release_sp3' · 6240812a
```
音声アーカイブにPlaceHolder追加。

See merge request !51
```
  Lee Munkyeong committed Apr 16, 2021
  6240812a Browse Files
- Merge branch 'features/#550_チャットルームの検索でユーザ選択ができない' into 'release_sp3' · 8241ce0d
```
クリックイベントのタイミング変更

See merge request !60
```
  Lee Munkyeong committed Apr 16, 2021
  8241ce0d Browse Files
- Merge branch 'features/#534_タブレットでダウンロードボタンの位置が仕様と違う' into 'release_sp3' · e22d4630
```
ダウンロードボタンcss修正

See merge request !58
```
  Lee Munkyeong committed Apr 16, 2021
  e22d4630 Browse Files
- Merge branch 'features/#568_日本語ルーム名エラー' into 'release_sp3' · 2a45821d
```
Features/#568 日本語ルーム名エラー

See merge request !59
```
  Lee Munkyeong committed Apr 16, 2021
  2a45821d Browse Files
- クリックイベントのタイミング変更 · 2878683b
  Lee Munkyeong committed Apr 16, 2021
  
  2878683b Browse Files
- パラメータ修正 · 39b65acc
  Lee Munkyeong committed Apr 16, 2021
  
  39b65acc Browse Files
- ルーム名をJS側でエンコードしないように修正 · 70521b71
  Lee Munkyeong committed Apr 16, 2021
  
  70521b71 Browse Files
- Merge branch 'features/#531_チャットルームキーボード表示' into 'release_sp3' · b1f6731b
```
キーボード最初表示とtoggle処理追加。

See merge request !56
```
  Lee Munkyeong committed Apr 16, 2021
  b1f6731b Browse Files
- Merge branch 'release_sp3' into 'features/#531_チャットルームキーボード表示' · 60f2d2fd
```
# Conflicts:
#   public_new/js/chat.js
```
  Lee Munkyeong committed Apr 16, 2021
  60f2d2fd Browse Files
- Conflict修正 · 9615d166
  Lee Munkyeong committed Apr 16, 2021
  
  9615d166 Browse Files
- Merge branch 'features/#551_空検索してもキーボードが日表示されない' into 'release_sp3' · b95bf3fb
```
#551対応。

See merge request !53
```
  Lee Munkyeong committed Apr 16, 2021
  b95bf3fb Browse Files
- ダウンロードボタンcss修正 · ba30ff51
  Lee Munkyeong committed Apr 16, 2021
  
  ba30ff51 Browse Files
- Merge branch 'features/#525' into 'release_sp3' · 1d31b4bf
```
[iOS] ユーザー表示

See merge request !57
```
  Takatoshi Miura committed Apr 16, 2021
  1d31b4bf Browse Files
- Merge branch 'release_sp3' into 'features/#525' · 541d030a
```
# Conflicts:
#   public_new/js/chat-ui.js
```
  Takatoshi Miura committed Apr 16, 2021
  541d030a Browse Files
- Merge branch 'features/#529_ルーム開設アラート' into 'release_sp3' · e65f703a
```
ルーム開設画面からルーム開設する場合既存のルームがあればアラート表示

See merge request !50
```
  Lee Munkyeong committed Apr 16, 2021
  e65f703a Browse Files