From b14729f22e7278db4b879995c916e3cad740722a Mon Sep 17 00:00:00 2001 From: bluejfox Date: Wed, 10 Oct 2018 16:42:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=87=B3Element=20UI=202.4.8?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge branch 'master' into current * master: (56 commits) [release] 2.4.8 [build] 2.4.8 changelog for 2.4.8 (#12950) Tabs: scroll to active tab (#12948) Tree: fix type definition (#12941) Table: fix table column default alignment (#12578) Table: called render header in index column (#12914) Input: s autocomplete on textarea (#12917) DatePicker: validate input date (#12898) chore: update date-picker comment notes (#12899) test: update test case for form (#12886) ButtonGroup: fix Dropdown style in ButtonGroup(#12815) (#12819) Form: emits error message on validate event (#12860) doc: update i18n doc for Serbian language (#12867) Tabs: fix order of TabNav when array is sorted (#12846) i18n: add Serbian translation (#12863) Tree: show indicator in drop node (#12854) Upload: add missing definition (#12839) i18n: update Greek translation (#12830) Dialog: add opened event (#12828) ... # Conflicts: # CHANGELOG.zh-CN.md # README.md # examples/docs/zh-CN/form.md # examples/versions.json # package.json # packages/date-picker/src/basic/date-table.vue # packages/date-picker/src/basic/month-table.vue # packages/date-picker/src/panel/date-range.vue # packages/form/src/form-item.vue # packages/theme-chalk/package.json # packages/theme-chalk/src/button.scss # src/index.js --- examples/versions.json | 2 +- src/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/versions.json b/examples/versions.json index 0691706669..a2cb63dfd7 100644 --- a/examples/versions.json +++ b/examples/versions.json @@ -1 +1 @@ -{"1.4.25":"1.4"} \ No newline at end of file +{"1.4.26":"1.4"} \ No newline at end of file diff --git a/src/index.js b/src/index.js index 40511d4b60..7ece576be8 100644 --- a/src/index.js +++ b/src/index.js @@ -194,7 +194,7 @@ if (typeof window !== 'undefined' && window.Vue) { } module.exports = { - version: '1.4.25', + version: '1.4.26', locale: locale.use, i18n: locale.i18n, install,