From 1044d930bd6eafa5c331f18647a2a13a29e91f35 Mon Sep 17 00:00:00 2001 From: iamkun Date: Thu, 29 Oct 2020 14:52:54 +0800 Subject: [PATCH] chore: update changelog (#20347) --- CHANGELOG.en-US.md | 21 +++++++++++++++++++++ CHANGELOG.es.md | 21 +++++++++++++++++++++ CHANGELOG.fr-FR.md | 21 +++++++++++++++++++++ CHANGELOG.zh-CN.md | 23 ++++++++++++++++++++++- build/bin/version.js | 2 +- build/deploy-ci.sh | 2 +- build/deploy-faas.sh | 2 +- 7 files changed, 88 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 3da0fdde8..b0b741b1e 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -1,5 +1,26 @@ ## Changelog +### 2.14.0 + +*2020-10-29* + +#### Breaking changes + +- Popconfirm + - Rename event name to `confirm`, `cancel` (#20240 by @hugiron)" + +#### Bug fixes + +- Progress + - Fix attribute error (#19985 by @Caaalabash) + +#### Optimization + +- I18n + - Update Russian translation (#19451 by @yangirov) + - Update Khmer translation (#20077 by @Sovai) + - Update Ukrainian translation (#20344 by @MammutAlex) + ### 2.13.2 *2020-05-18* diff --git a/CHANGELOG.es.md b/CHANGELOG.es.md index 94c8c3b33..697efd57b 100644 --- a/CHANGELOG.es.md +++ b/CHANGELOG.es.md @@ -1,5 +1,26 @@ ## Changelog +### 2.14.0 + +*2020-10-29* + +#### Breaking changes + +- Popconfirm + - Rename event name to `confirm`, `cancel` (#20240 by @hugiron)" + +#### Bug fixes + +- Progress + - Fix attribute error (#19985 by @Caaalabash) + +#### Optimization + +- I18n + - Update Russian translation (#19451 by @yangirov) + - Update Khmer translation (#20077 by @Sovai) + - Update Ukrainian translation (#20344 by @MammutAlex) + ### 2.13.2 *2020-05-18* diff --git a/CHANGELOG.fr-FR.md b/CHANGELOG.fr-FR.md index ad0778971..d2cda59bd 100644 --- a/CHANGELOG.fr-FR.md +++ b/CHANGELOG.fr-FR.md @@ -1,5 +1,26 @@ ## Changelog +### 2.14.0 + +*2020-10-29* + +#### Breaking changes + +- Popconfirm + - Rename event name to `confirm`, `cancel` (#20240 by @hugiron)" + +#### Bug fixes + +- Progress + - Fix attribute error (#19985 by @Caaalabash) + +#### Optimization + +- I18n + - Update Russian translation (#19451 by @yangirov) + - Update Khmer translation (#20077 by @Sovai) + - Update Ukrainian translation (#20344 by @MammutAlex) + ### 2.13.2 *2020-05-18* diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index bc684a5ba..c29880c55 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -1,5 +1,26 @@ ## 更新日志 +### 2.14.0 + +*2020-10-29* + +#### 非兼容性更新 + +- Popconfirm + - 事件名称修改为 `confirm`, `cancel` (#20240 by @hugiron)" + +#### Bug 修复 + +- Progress + - 修复参数错误的问题 (#19985 by @Caaalabash) + +#### 优化 + +- I18n + - 更新俄语翻译 (#19451 by @yangirov) + - 更新高棉语翻译 (#20077 by @Sovai) + - 更新乌克兰语翻译 (#20344 by @MammutAlex) + ### 2.13.2 *2020-05-18* @@ -11,7 +32,7 @@ - Image - 更新错误状态 (#19194 by @lhx6538665) -#### Optimization +#### 优化 - I18n - 更新 ru-RU popconfirm 翻译 (#19220 by @Opppex) diff --git a/build/bin/version.js b/build/bin/version.js index 696e3fbfd..118d98157 100644 --- a/build/bin/version.js +++ b/build/bin/version.js @@ -2,5 +2,5 @@ var fs = require('fs'); var path = require('path'); var version = process.env.VERSION || require('../../package.json').version; var content = { '1.4.13': '1.4', '2.0.11': '2.0', '2.1.0': '2.1', '2.2.2': '2.2', '2.3.9': '2.3', '2.4.11': '2.4', '2.5.4': '2.5', '2.6.3': '2.6', '2.7.2': '2.7', '2.8.2': '2.8', '2.9.2': '2.9', '2.10.1': '2.10', '2.11.1': '2.11', '2.12.0': '2.12' }; -if (!content[version]) content[version] = '2.13'; +if (!content[version]) content[version] = '2.14'; fs.writeFileSync(path.resolve(__dirname, '../../examples/versions.json'), JSON.stringify(content)); diff --git a/build/deploy-ci.sh b/build/deploy-ci.sh index 76117e366..34549b11d 100644 --- a/build/deploy-ci.sh +++ b/build/deploy-ci.sh @@ -40,7 +40,7 @@ if [ "$TRAVIS_TAG" ]; then # build sub folder echo $TRAVIS_TAG - SUB_FOLDER='2.13' + SUB_FOLDER='2.14' mkdir $SUB_FOLDER rm -rf *.js *.css *.map static rm -rf $SUB_FOLDER/** diff --git a/build/deploy-faas.sh b/build/deploy-faas.sh index 708fd18d9..753415859 100644 --- a/build/deploy-faas.sh +++ b/build/deploy-faas.sh @@ -6,7 +6,7 @@ cd temp_web git clone --depth 1 -b gh-pages --single-branch https://github.com/ElemeFE/element.git && cd element # build sub folder -SUB_FOLDER='2.13' +SUB_FOLDER='2.14' mkdir -p $SUB_FOLDER rm -rf *.js *.css *.map static rm -rf $SUB_FOLDER/**