Commits · 39b65accdb975bb04ed5e649b341072e479cbf55 · abookCommunication / chat_webview · GitLab

16 Apr, 2021 20 commits
- パラメータ修正 · 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
- 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
- Merge branch 'features/#553_アーカイブ詳細で自分のネームカードが表示される。' into 'release_sp3' · 04e763a9
```
自分の場合ネームカードを作らないように修正。

See merge request !52
```
  Lee Munkyeong committed Apr 16, 2021
  04e763a9 Browse Files
- Merge branch 'features/#528_グループ名パンクズ表示' into 'release_sp3' · b2448b84
```
css修正

See merge request !54
```
  Lee Munkyeong committed Apr 16, 2021
  b2448b84 Browse Files
- Merge branch 'features/#545_オフライン時メッセージ欄非表示' into 'release_sp3' · b460cb0a
```
オフライン時非表示項目追加

See merge request !55
```
  Lee Munkyeong committed Apr 16, 2021
  b460cb0a Browse Files
- キーボード最初表示とtoggle処理追加。 · 6eaeba8d
  Lee Munkyeong committed Apr 16, 2021
  
  6eaeba8d Browse Files
- オフライン時非表示項目追加 · 25e7aa21
  Lee Munkyeong committed Apr 16, 2021
  
  25e7aa21 Browse Files
- css修正 · cafebcff
  Lee Munkyeong committed Apr 16, 2021
  
  cafebcff Browse Files
- #551対応。 · 3f02b9af
  Lee Munkyeong committed Apr 16, 2021
  
  3f02b9af Browse Files
- 自分の場合ネームカードを作らないように修正。 · c341c7c0
  Lee Munkyeong committed Apr 16, 2021
  
  c341c7c0 Browse Files
- js連携 · 862e02b5
  Takatoshi Miura committed Apr 16, 2021
  
  862e02b5 Browse Files
- ルーム開設画面からルーム開設する場合既存のルームがあればアラート表示 · ac02f3e4
  Lee Munkyeong committed Apr 16, 2021
  
  ac02f3e4 Browse Files
- ios-js連携修正 · 4aee10e4
  Takatoshi Miura committed Apr 16, 2021
  
  4aee10e4 Browse Files
15 Apr, 2021 11 commits
- added loginInfoRequestMessageHandlerId · 3b1e438c
  Kim Peace committed Apr 15, 2021
  
  3b1e438c Browse Files
- Merge branch 'origin/#516' into 'release_sp3' · 9c802a74
```
入室処理追加

See merge request !48
```
  Takatoshi Miura committed Apr 15, 2021
  9c802a74 Browse Files
- Merge branch 'feature/go_home' into 'release_sp3' · f01b554d
```
Feature/go home

See merge request !49
```
  Kim Peace committed Apr 15, 2021
  f01b554d Browse Files
- Fixed indent · 908b589e
  Kim Peace committed Apr 15, 2021
  
  908b589e Browse Files
- Merge commit '643b084a' into origin/develop_apply_design_chat · df133961
```
# Conflicts:
#	public_new/chat.html
#	public_new/contact.html
#	public_new/js/chat-ui.js
#	public_new/template/template_user_name_card.html
```
  Kim Peace committed Apr 15, 2021
  df133961 Browse Files
- 入室処理追加 · 93b28b48
  Takatoshi Miura committed Apr 15, 2021
  
  93b28b48 Browse Files
- Merge branch 'origin/#526_myInfo' into 'release_sp3' · 83c48a91
```
Origin/#526 my info

See merge request !47
```
  Takatoshi Miura committed Apr 15, 2021
  83c48a91 Browse Files
- Merge branch 'release_sp3' into 'origin/#526_myInfo' · 254b1548
```
# Conflicts:
#   public_new/js/chat-ui.js
```
  Takatoshi Miura committed Apr 15, 2021
  254b1548 Browse Files
- クラス名修正 · 7575eeff
  Takatoshi Miura committed Apr 15, 2021
  
  7575eeff Browse Files
- 全グループタブでmyInfoが表示される不具合を修正 · be4ea459
  Takatoshi Miura committed Apr 15, 2021
  
  be4ea459 Browse Files
- js連動 · 139a0c52
  Takatoshi Miura committed Apr 15, 2021
  
  139a0c52 Browse Files
14 Apr, 2021 3 commits
- ios連動 · bf3ec123
  Takatoshi Miura committed Apr 14, 2021
  
  bf3ec123 Browse Files
- Merge branch 'origin/archive' into 'release_sp3' · dfe61f51
```
iosアーカイブ連動

See merge request !45
```
  Takatoshi Miura committed Apr 14, 2021
  dfe61f51 Browse Files
- メッセージ文字数600制限の空欄の削除 · 401f36d8
  Lee Daehyun committed Apr 14, 2021
  
  401f36d8 Browse Files
13 Apr, 2021 6 commits
- iosアーカイブ連動 · 1e86ee5f
  Takatoshi Miura committed Apr 13, 2021
  
  1e86ee5f Browse Files
- Merge branch 'features/#520,#521_プッシュメッセージからルームに入場すると操作ができない' into 'release_sp3' · d432fcf9
```
既存処理削除。

See merge request !44
```
  Lee Munkyeong committed Apr 13, 2021
  d432fcf9 Browse Files
- 既存処理削除。 · fb771d1f
  Lee Munkyeong committed Apr 13, 2021
  
  fb771d1f Browse Files
- Merge branch 'origin/bugfix#515_DisplayGroup' into 'release_sp3' · 38d84d35
```
Origin/bugfix#515 display group

See merge request !43
```
  Takatoshi Miura committed Apr 13, 2021
  38d84d35 Browse Files
- 招待するとき同じ参加者があるチャットルームに移動しなく以前のチャットルームに移動するエラー修正 · aaa47ebb
  Lee Daehyun committed Apr 13, 2021
  
  aaa47ebb Browse Files
- インデント修正 · 831f0d30
  Takatoshi Miura committed Apr 13, 2021
  
  831f0d30 Browse Files