Commits · 5b26391aa86e53fafb2f6e44544c3025531553df · abookCommunication / chat_webview · GitLab

08 Apr, 2021 18 commits
- Merge branch 'release_sp3' into bugFix/#486_全クループ画面から全社範囲と全社の下位グループのアコーディオン範囲が重なって動作する · 5b26391a
  Lee Daehyun committed Apr 08, 2021
  
  5b26391a Browse Files
- Merge branch 'origin/develop_bugfix' into 'release_sp3' · 5b684341
```
undefined対策

See merge request !30
```
  Lee Daehyun committed Apr 08, 2021
  5b684341 Browse Files
- Merge branch 'bugFix/#42198_#42198_And_search_All_Search' into 'release_sp3' · 6e2d9b07
```
Bug fix/#42198 #42198 and search all search

See merge request !26
```
  Lee Munkyeong committed Apr 08, 2021
  6e2d9b07 Browse Files
- Merge branch 'release_sp3' into 'origin/develop_bugfix' · 555001d0
```
# Conflicts:
#   public_new/chat.html
#   public_new/contact.html
#   public_new/js/chat-ui.js
```
  Takatoshi Miura committed Apr 08, 2021
  555001d0 Browse Files
- 全グループ画面から全社のパンクズのグループセールの重なっているバグ修正 · 998e751a
  Lee Daehyun committed Apr 08, 2021
  
  998e751a Browse Files
- undefined対策 · 2f285958
  Takatoshi Miura committed Apr 08, 2021
  
  2f285958 Browse Files
- Merge branch 'bugFix/#42192操作改善1' into 'release_sp3' · 45c0c6ba
```
bugFix/#42192操作改善1

See merge request !22
```
  Lee Daehyun committed Apr 08, 2021
  45c0c6ba Browse Files
- OSごとに処理分離 · fcfa41f3
  Lee Munkyeong committed Apr 08, 2021
  
  fcfa41f3 Browse Files
- インデント修正 · 2a9b485a
  Lee Daehyun committed Apr 08, 2021
  
  2a9b485a Browse Files
- Merge branch 'release_sp3' into 'bugFix/#42192操作改善1' · 558f93ca
```
# Conflicts:
#   public_new/chat_room.html
```
  Lee Daehyun committed Apr 08, 2021
  558f93ca Browse Files
- Merge branch 'bugFix/ネームカード名前ずれ' into 'release_sp3' · 42b78026
```
Bug fix/ネームカード名前ずれ

See merge request !24
```
  Lee Daehyun committed Apr 08, 2021
  42b78026 Browse Files
- Merge branch 'origin/develop_apply_design_archive_detail' into 'release_sp3' · 897c3197
```
Origin/develop apply design archive detail

See merge request !29
```
  Takatoshi Miura committed Apr 08, 2021
  897c3197 Browse Files
- Merge branch 'release_sp3' into 'origin/develop_apply_design_archive_detail' · 515dc8dc
```
# Conflicts:
#   public_new/chat.html
#   public_new/chat_room.html
#   public_new/contact.html
#   public_new/js/chat-ui.js
```
  Takatoshi Miura committed Apr 08, 2021
  515dc8dc Browse Files
- Merge branch 'bugFix/#480_dose_not_open_name_card_in_chat_room' into 'release_sp3' · 4d27dd46
```
Bug fix/#480 dose not open name card in chat room

See merge request !28
```
  Lee Munkyeong committed Apr 08, 2021
  4d27dd46 Browse Files
- iosローカルdb連動 · a3648cec
  Takatoshi Miura committed Apr 08, 2021
  
  a3648cec Browse Files
- MR修正 · 0a563678
  Lee Daehyun committed Apr 08, 2021
  
  0a563678 Browse Files
- Merge branch 'release_sp3' into 'bugFix/ネームカード名前ずれ' · b2e55c82
```
# Conflicts:
#   public_new/chat_room.html
```
  Lee Daehyun committed Apr 08, 2021
  b2e55c82 Browse Files
- MR インデント、function名変更 · 35c0cc47
  Lee Daehyun committed Apr 08, 2021
  
  35c0cc47 Browse Files
07 Apr, 2021 16 commits
- iosローカルdb連動中 · c5b0f5af
  Takatoshi Miura committed Apr 07, 2021
  
  c5b0f5af Browse Files
- Merge branch 'bugFix/#434_video_play_in_room' into 'release_sp3' · e9bfd760
```
動画のメッセージ作成修正。

See merge request !23
```
  Lee Munkyeong committed Apr 07, 2021
  e9bfd760 Browse Files
- Merge branch 'bugFix/#476_line_does_not_change_in_long_message' into 'release_sp3' · be690357
```
メッセージ改行修正。

See merge request !27
```
  Lee Munkyeong committed Apr 07, 2021
  be690357 Browse Files
- コード整理 · 67f160f4
  Lee Munkyeong committed Apr 07, 2021
  
  67f160f4 Browse Files
- チャットルーム内のネームカード表示 · 2d1e5979
  Lee Munkyeong committed Apr 07, 2021
  
  2d1e5979 Browse Files
- コードレビュー対応。 · 520992c9
  Lee Munkyeong committed Apr 07, 2021
  
  520992c9 Browse Files
- メッセージ改行修正。 · 077659d0
  Lee Munkyeong committed Apr 07, 2021
  
  077659d0 Browse Files
- iosローカルdb連携中 · b8c0ce73
  Takatoshi Miura committed Apr 07, 2021
  
  b8c0ce73 Browse Files
- ネームカードUI修正 · d5e76937
  Lee Daehyun committed Apr 07, 2021
  
  d5e76937 Browse Files
- メッセージ検索 · 7f83361b
  Lee Munkyeong committed Apr 07, 2021
  
  7f83361b Browse Files
- Merge branch 'origin/develop_apply_design' into 'release_sp3' · 0c47d0a1
```
Origin/develop apply design

See merge request !25
```
  Lee Daehyun committed Apr 07, 2021
  0c47d0a1 Browse Files
- Merge branch 'release_sp3' into 'origin/develop_apply_design' · 2c723bc5
```
# Conflicts:
#   public_new/chat_room.html
```
  Lee Daehyun committed Apr 07, 2021
  2c723bc5 Browse Files
- Merge branch 'release_sp3' into 'bugFix/ネームカード名前ずれ' · 2cb93bcf
```
# Conflicts:
#   public_new/chat_room.html
```
  Lee Daehyun committed Apr 07, 2021
  2cb93bcf Browse Files
- Merge branch 'release_sp3' into 'bugFix/#42192操作改善1' · 5b50ed5d
```
# Conflicts:
#   public_new/chat_room.html
#   public_new/css/chat.css
```
  Lee Daehyun committed Apr 07, 2021
  5b50ed5d Browse Files
- ネームカードのユーザー名デザイン修正 · a0a65567
  Lee Daehyun committed Apr 07, 2021
  
  a0a65567 Browse Files
- 検索処理修正。 · 51874fc0
  Lee Munkyeong committed Apr 07, 2021
  
  51874fc0 Browse Files
06 Apr, 2021 6 commits
- iosローカルdb連携中 · fc5eb4c0
  Takatoshi Miura committed Apr 06, 2021
  
  fc5eb4c0 Browse Files
- 元HTML変換 · 3d741e2c
  Lee Daehyun committed Apr 06, 2021
  
  3d741e2c Browse Files
- お気に入りの選択範囲広げる修正 · 2efb8f53
  Lee Daehyun committed Apr 06, 2021
  
  2efb8f53 Browse Files
- Merge branch 'bugFix/#42144_contact_screen' into 'release_sp3' · f4dcc293
```
Bug fix/#42144 contact screen

See merge request !21
```
  Lee Munkyeong committed Apr 06, 2021
  f4dcc293 Browse Files
- #42144 · eecd5a9f
  Lee Munkyeong committed Apr 06, 2021
  
  eecd5a9f Browse Files
- Merge branch 'bugFix/#436_message_picture_modal' into 'origin/develop_apply_design' · e50b71b5
```
Bug fix/#436 message picture modal

See merge request !20
```
  Lee Daehyun committed Apr 06, 2021
  e50b71b5 Browse Files