diff --git a/.travis.yml b/.travis.yml index b2dce90ad..0461faada 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ git: node_js: - 12.4.0 before_install: - - echo -e "[submodule "antdv-demo"]\n path = antdv-demo\n https://$GITHUB_TOKEN@github.com/tangjinzhou/antdv-demo.git" >~/.gitmodules + - echo -e "machine github.com\n login Travis\n password $GITHUB_TOKEN" > ~/.netrc - git submodule update --init --recursive before_script: - npm install vue vue-template-compiler diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 796655739..985cdee04 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -14,8 +14,6 @@ `2020-03-06` -### Component features and styles are synchronized to antd version 3.26.12. - - Four new components have been added: - 🔥🔥🔥 [Mentions](https://antdv.com/components/mentions-cn/) Added mentioned components and discarded the original Mention components. - 🔥🔥🔥 [Descriptions](https://antdv.com/components/descriptions-cn/) Display multiple read-only fields in groups. @@ -462,9 +460,7 @@ - 🎉 🎉 🎉 Publish the vscode plugin [ant-design-vue-helper](https://marketplace.visualstudio.com/items?itemName=ant-design-vue.vscode-ant-design-vue-helper) - 🎉 🎉 🎉 Optimize official website document interaction -### Component features and styles are synchronized to antd version 3.11.6. - -1.3.0 brings two new Components, a lot of exciting changes and new features. + 1.3.0 brings two new Components, a lot of exciting changes and new features. - 🔥 Added a new component [Comment](https://www.antdv.com/components/comment/)。 - 🔥 dded a new component [ConfigProvider](https://www.antdv.com/components/config-provider/) for user to customize some global setting. diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index e5fbcd62a..1639a4c9b 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -14,8 +14,6 @@ `2020-03-06` -### 组件功能和样式同步到 antd 3.26.12 版本。 - - 新增了四个组件: - 🔥🔥🔥 [Mentions](https://antdv.com/components/mentions-cn/) 新增提及组件并废弃原有 Mention 组件。 - 🔥🔥🔥 [Descriptions](https://antdv.com/components/descriptions-cn/) 成组展示多个只读字段。 @@ -465,9 +463,7 @@ - 🎉 🎉 🎉 发布 vscode 插件 [ant-design-vue-helper](https://marketplace.visualstudio.com/items?itemName=ant-design-vue.vscode-ant-design-vue-helper) - 🎉 🎉 🎉 优化官网文档交互 -### 组件功能和样式同步到 antd 3.11.6 版本。 - -1.3.0 版本带来了两个新组件,还有很多激动人心的变化和新特性。 + 1.3.0 版本带来了两个新组件,还有很多激动人心的变化和新特性。 - 🔥 增加了一个新组件 [Comment](https://www.antdv.com/components/comment-cn/)。 - 🔥 增加了一个新组件 [ConfigProvider](https://www.antdv.com/components/config-provider-cn/) 为组件提供统一的全局化配置。 diff --git a/antdv-demo b/antdv-demo index 805d3298a..6cb6deed5 160000 --- a/antdv-demo +++ b/antdv-demo @@ -1 +1 @@ -Subproject commit 805d3298a8c2a6fc5deee94ad0db8cab014cd2d8 +Subproject commit 6cb6deed574c408cddcf6c9271132e36f8975168