Commits · c704444216d32f09310f1ee97c0eee2398c8de77 · abookCommunication / chat_webview · GitLab

30 Jul, 2021 2 commits
- Merge branch 'develop' into 'develop_kim-ec' · c7044442
```
Develop

See merge request !204
```
  Kim Eunchul committed Jul 30, 2021
  c7044442 Browse Files
- Merge branch 'develop_kim-ec' into 'develop' · 9b995d74
```
# Conflicts:
#   public_new/js/sockets/chat-websocket-message.js
```
  Kim Eunchul committed Jul 30, 2021
  9b995d74 Browse Files
29 Jul, 2021 8 commits
- #43695 ウェブソケットの送信方式変更 · 2be15710
  Kim Eunchul committed Jul 29, 2021
  
  2be15710 Browse Files
- Merge branch 'design/playground' into 'develop' · f6859950
```
プロフィールモーダルUI変更

See merge request !203
```
  Kim Peace committed Jul 29, 2021
  f6859950 Browse Files
- Merge branch 'refactoring/join_collaboration' into 'develop' · c9223c14
```
Refactoring/join collaboration

See merge request !202
```
  Kim Peace committed Jul 29, 2021
  c9223c14 Browse Files
- Removed unused console print · d39c14e0
  Kim Peace committed Jul 29, 2021
  
  d39c14e0 Browse Files
- Removed debug console prints · 6d18ffaa
  Kim Peace committed Jul 29, 2021
  
  6d18ffaa Browse Files
- Fixed to display add user in collaboration · 7b2f9c51
  Kim Peace committed Jul 29, 2021
  
  7b2f9c51 Browse Files
- プロフィールモーダルUI変更 · 445a7c33
  藤川諒 committed Jul 29, 2021
  
  445a7c33 Browse Files
- #43695 ウェブソケットの送信方式変更 · 4520946c
  Kim Eunchul committed Jul 29, 2021
  
  4520946c Browse Files
28 Jul, 2021 7 commits
- Fixed to display loading indicator in collaboration · e567327d
  Kim Peace committed Jul 28, 2021
  
  e567327d Browse Files
- Fixed to display native loading indicator in android · caecb139
  Kim Peace committed Jul 28, 2021
  
  caecb139 Browse Files
- Fixed chat room loading indicator timing · 71bcbbc2
  Kim Peace committed Jul 28, 2021
  
  71bcbbc2 Browse Files
- Fixed message display order to colomn reversed · 1de8bd84
  Kim Peace committed Jul 28, 2021
  
  1de8bd84 Browse Files
- Merge branch 'develop' into refactoring/join_collaboration · 24a59d1f
  Kim Peace committed Jul 28, 2021
  
  24a59d1f Browse Files
- Fixed exit collaborations · 1e972aaf
  Kim Peace committed Jul 28, 2021
  
  1e972aaf Browse Files
- Merge branch 'develop_onuma' into 'develop' · 976f40c4
```
#42666 アーカイブ詳細画面で任意ユーザのネームカードを表示し、任意グループを選択しても、該当グループは表示されない。

See merge request !200
```
  onuma committed Jul 28, 2021
  976f40c4 Browse Files
27 Jul, 2021 4 commits
- Fixed not to display today system message label · 207cdfab
  Kim Peace committed Jul 27, 2021
  
  207cdfab Browse Files
- Fixed loading indicator · a30a3d69
  Kim Peace committed Jul 27, 2021
  
  a30a3d69 Browse Files
- contact.htmlへの遷移をcontact.js から namecard.jsに移動。 · 3d2da3a6
  onuma committed Jul 27, 2021
  
  3d2da3a6 Browse Files
- アーカイブ詳細画面で任意ユーザのネームカードを表示し、任意グループを選択しても、該当グループは表示されない。 · 6948af59
  onuma committed Jul 27, 2021
  
  6948af59 Browse Files
26 Jul, 2021 9 commits
- Fixed capture svg file path · eb1edc39
  Kim Peace committed Jul 26, 2021
  
  eb1edc39 Browse Files
- isIOSをisiOSに統一 · 99429c30
  onuma committed Jul 26, 2021
  
  99429c30 Browse Files
- Merge branch 'develop' of gitlab.agentec.jp:abookCommunication/chat_webview into develop · 9ecee0d3
  onuma committed Jul 26, 2021
  
  9ecee0d3 Browse Files
- Fixed parse bool and string · 17b9e57b
  Kim Peace committed Jul 26, 2021
  
  17b9e57b Browse Files
- Fixed font style order · ad2ba6d3
  Kim Peace committed Jul 26, 2021
  
  ad2ba6d3 Browse Files
- Merge branch 'refactoring/boolValueFromString' into 'develop' · 4f6bf9b1
```
Refactoring/bool value from string

See merge request !199
```
  Kim Peace committed Jul 26, 2021
  4f6bf9b1 Browse Files
- Fixed parse bool and string · 79decaa6
  Kim Peace committed Jul 26, 2021
  
  79decaa6 Browse Files
- Fixed font style order · 0aaa71bf
  Kim Peace committed Jul 26, 2021
  
  0aaa71bf Browse Files
- Merge branch 'develop_onuma' into 'develop' · 8e1aea93
```
協業に参加できない不具合を修正した。

See merge request !198
```
  onuma committed Jul 26, 2021
  8e1aea93 Browse Files
21 Jul, 2021 1 commit
- 協業に参加できない不具合を修正した。 · a2cab780
  onuma committed Jul 21, 2021
  
  a2cab780 Browse Files
20 Jul, 2021 9 commits
- Merge branch 'develop_refactoring_onuma' into 'develop' · c153ba62
```
isOnile の判定を文字列からbool値に変更した。

See merge request !197
```
  onuma committed Jul 20, 2021
  c153ba62 Browse Files
- Merge branch 'bug/#43632_call_button_on_namecard' into 'develop' · c565bd21
```
Fixed possible to call from name card

See merge request !196
```
  Kim Peace committed Jul 20, 2021
  c565bd21 Browse Files
- Merge branch 'feature/#42566_initial_system_message_on_top_of_chatroom' into 'develop' · 79835e38
```
Add top date label in chat room

See merge request !195
```
  Kim Peace committed Jul 20, 2021
  79835e38 Browse Files
- deviceInfo の isMobile を booleanに変更 · bf18ef8c
  onuma committed Jul 20, 2021
  
  bf18ef8c Browse Files
- != true で判定していた箇所を == falseで判定するように修正 · 5604a81d
  onuma committed Jul 20, 2021
  
  5604a81d Browse Files
- isOnile の判定を文字列からbool値に変更した。 · 0cf492de
  onuma committed Jul 20, 2021
  
  0cf492de Browse Files
- Merge branch 'develop_43227' into 'develop' · 61aedfb4
```
Bug #43227 新規インストールやアップデート後に文書協業を開くと「会議室サーバに接続できませんでした」と、アラート表示される

See merge request !193
```
  Kim Jinsung committed Jul 20, 2021
  61aedfb4 Browse Files
- Merge branch 'develop' into develop_43227 · a78198ef
```
# Conflicts:
#	public_new/js/share.js
```
  Kim Jinsung committed Jul 20, 2021
  a78198ef Browse Files
- Fixed possible to call from name card · 7ed31acf
  Kim Peace committed Jul 20, 2021
  
  7ed31acf Browse Files