Commits · 41fff884eebf83201beb3f15b6f23d98279a5cb2 · abookCommunication / chat_webview · GitLab

17 Apr, 2021 6 commits
- Merge branch 'origin/#573_message' into 'release_sp3' · 41fff884
```
android追加修正分の適用

See merge request !62
```
  Takatoshi Miura committed Apr 17, 2021
  41fff884 Browse Files
- 文言修正 · 3d74fed4
  Lee Munkyeong committed Apr 17, 2021
  
  3d74fed4 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 29 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
- 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
- 音声アーカイブにPlaceHolder追加。 · 677be9cb
  Lee Munkyeong committed Apr 16, 2021
  
  677be9cb 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 5 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