Skip to content

Commit cf0e8a5

Browse files
authored
Merge branch 'master' into hotfix/v1.10.4
2 parents 117264a + 220a247 commit cf0e8a5

File tree

7 files changed

+892
-19
lines changed

7 files changed

+892
-19
lines changed

README.md

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
![version](https://img.shields.io/badge/node-v8.x-blue.svg)
77
![Branch stable](https://img.shields.io/badge/stable%20branch-master-blue.svg)
88
![Branch Develop](https://img.shields.io/badge/dev%20branch-develop-blue.svg)
9-
<a href="slack.vuestorefront.io">![Branch Develop](https://img.shields.io/badge/community%20chat-slack-FF1493.svg)</a>
9+
<a href="https://slack.vuestorefront.io">![Branch Develop](https://img.shields.io/badge/community%20chat-slack-FF1493.svg)</a>
1010

1111
Vue Storefront is a standalone PWA storefront for your eCommerce, possible to connect with any eCommerce backend (eg. Magento, <a href="https://github.com/DivanteLtd/coreshop-vsbridge">Pimcore/CoreShop</a>, [BigCommerce](https://github.com/DivanteLtd/bigcommerce2vuestorefront), Prestashop or Shopware) through the API.
1212

@@ -831,6 +831,53 @@ Vue Storefront is a Community effort brought to You by our great Core Team and s
831831
height="40"
832832
>
833833
</a>
834+
</td>
835+
</tr>
836+
<tr>
837+
<td align="center" valign="middle">
838+
<a href="https://www.helloevery1.com/">
839+
<img
840+
src="https://divante.com/partners/Vue-Storefront/every1-logo.png"
841+
alt="every1"
842+
height="40"
843+
>
844+
</a>
845+
</td>
846+
<td align="center" valign="middle">
847+
<a href="https://www.lightcom.io/">
848+
<img
849+
src="https://divante.com/partners/Vue-Storefront/Logo%20PNG%20File.png"
850+
alt="Lightcom"
851+
height="40"
852+
>
853+
</a>
854+
</td>
855+
<td align="center" valign="middle">
856+
<a href="">
857+
<img
858+
src=""
859+
alt=""
860+
height="40"
861+
>
862+
</a>
863+
</td>
864+
<td align="center" valign="middle">
865+
<a href="">
866+
<img
867+
src=""
868+
alt=""
869+
height="40"
870+
>
871+
</a>
872+
</td>
873+
<td align="center" valign="middle">
874+
<a href="">
875+
<img
876+
src=""
877+
alt=""
878+
height="40"
879+
>
880+
</a>
834881
</td>
835882
</tr>
836883
</tbody>

docs/guide/basics/configuration.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ Please take a look at the `node-config` docs as the library is open for some oth
1414

1515
:::tip NOTE
1616
Currently, the configuration files are being processed by the webpack during the build process. This means that whenever you apply some configuration changes, you shall rebuild the app, even when using the `yarn dev` mode. This limitation can be solved with the VS 1.4 special config variable. Now the config can be reloaded on the fly with each server request if `config.server.dynamicConfigReload`is set to true. However, in that case, the config is added to `window.**INITIAL_STATE**` with the responses.
17+
18+
When you using the `config.server.dynamicConfigReload` plase remember about `config.server.dynamicConfigExclude` and `config.server.dynamicConfigInclude`.
1719
:::
1820

1921
Please find the configuration properties reference below.

0 commit comments

Comments
 (0)