Commits · 3f02b9af94932efd198d1467575505ab2f12e815 · abookCommunication / chat_webview · GitLab

16 Apr, 2021 1 commit
- #551対応。 · 3f02b9af
  Lee Munkyeong committed Apr 16, 2021
  
  3f02b9af Browse Files
15 Apr, 2021 10 commits
- 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 12 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
- ルーム開設画面の連動 · 73ae6615
  Takatoshi Miura committed Apr 13, 2021
  
  73ae6615 Browse Files
- ルーム開設画面とiosの連動 · 562d3764
  Takatoshi Miura committed Apr 13, 2021
  
  562d3764 Browse Files
- コード整理 · 0e476aab
  Lee Munkyeong committed Apr 13, 2021
  
  0e476aab Browse Files
- Merge branch 'bugFix/#467_dose_not_show_profile_on_offline' into 'release_sp3' · 5bfd24ad
```
Bug fix/#467 dose not show profile on offline

See merge request !42
```
  Lee Munkyeong committed Apr 13, 2021
  5bfd24ad Browse Files
- Merge branch 'bugFix/#467_dose_not_show_profile_on_offline' of… · c98d1c66
```
Merge branch 'bugFix/#467_dose_not_show_profile_on_offline' of gitlab.agentec.jp:abookCommunication/chat_webview into bugFix/#467_dose_not_show_profile_on_offline
```
  Lee Munkyeong committed Apr 13, 2021
  c98d1c66 Browse Files
- オフライン対応 · e966ab66
  Lee Munkyeong committed Apr 13, 2021
  
  e966ab66 Browse Files
12 Apr, 2021 14 commits
- Merge branch 'release_sp3' into 'bugFix/#467_dose_not_show_profile_on_offline' · 71a7c5c9
```
# Conflicts:
#   public_new/js/chat-ui.js
```
  Lee Munkyeong committed Apr 12, 2021
  71a7c5c9 Browse Files
- Conflict修正。 · 70abde24
  Lee Munkyeong committed Apr 12, 2021
  
  70abde24 Browse Files
- インデント修正 · 73cc17c9
  Lee Munkyeong committed Apr 12, 2021
  
  73cc17c9 Browse Files
- オフライン対応 · 56f1d9e2
  Lee Munkyeong committed Apr 12, 2021
  
  56f1d9e2 Browse Files
- Merge branch 'feature/abcomm_sp3_archive' into 'release_sp3' · 4dbca001
```
Feature/abcomm sp3 archive

See merge request !40
```
  Lee Munkyeong committed Apr 12, 2021
  4dbca001 Browse Files
- Merge branch 'bugFix/#507_メッセージシステム日付追加' into 'release_sp3' · 2a9e8193
```
システムメッセージ日付追加

See merge request !41
```
  Lee Daehyun committed Apr 12, 2021
  2a9e8193 Browse Files
- システムメッセージ日付追加 · c264090c
  Lee Daehyun committed Apr 12, 2021
  
  c264090c Browse Files
- Merge branch 'release_sp3' into 'feature/abcomm_sp3_archive' · bc275966
```
# Conflicts:
#   public_new/archive_detail.html
```
  Lee Munkyeong committed Apr 12, 2021
  bc275966 Browse Files
- Conflicts対応。 · 1943f996
  Lee Munkyeong committed Apr 12, 2021
  
  1943f996 Browse Files
- コード整理 · 06602c45
  Lee Munkyeong committed Apr 12, 2021
  
  06602c45 Browse Files
- アーカイブ一覧、詳細実装 · b32f3df0
  Lee Munkyeong committed Apr 12, 2021
  
  b32f3df0 Browse Files
- Merge branch 'bugFix/#482_ルームタイプのメモライズ' into 'release_sp3' · 3af4cef7
```
#482対応。

See merge request !34
```
  Lee Munkyeong committed Apr 12, 2021
  3af4cef7 Browse Files
- Merge branch 'bugFix/#477_未読数追加' into 'release_sp3' · 7ed29d07
```
未読数実装

See merge request !37
```
  Lee Munkyeong committed Apr 12, 2021
  7ed29d07 Browse Files
- Merge branch 'origin/bugfix#494' into 'release_sp3' · 30b36fe2
```
修正漏れ

See merge request !39
```
  Takatoshi Miura committed Apr 12, 2021
  30b36fe2 Browse Files