mirrors/element
1
0
Fork 0
mirror of https://github.com/ElemeFE/element.git synced 2025-12-13 11:34:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'eleme/dev' into carbon

Browse Source 
# Conflicts:
#	CHANGELOG.en-US.md
#	CHANGELOG.zh-CN.md
#	examples/app.vue
#	examples/docs/en-US/switch.md
#	examples/docs/zh-CN/switch.md
#	examples/versions.json
#	package.json
#	packages/switch/src/component.vue
#	packages/theme-default/package.json
#	packages/theme-default/src/common/var.css
#	packages/theme-default/src/switch.css
#	src/index.js
This commit is contained in:
Leopoldthecoder
2017-10-16 18:33:41 +08:00
parent 15d7b52014 48c3f6719b
commit f0b7debd23
6 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.en-US.md
View File

@@ -177,6 +177,14 @@ in `lazy` mode #6235
##
<i><sup>*</sup> Dynamically rendering arbitrary HTML on your website can be very dangerous because it can easily lead to [XSS attacks](https://en.wikipedia.org/wiki/Cross-site_scripting). So when `dangerouslyUseHTMLString` is on, please make sure the content of `message` is trusted, and **never** assign `message` to user-provided content.</i>
### 1.4.7
*2017-10-16*
- Fixed compatibility of Autocomplete and Vue 2.5.x, #6942 (by @rennai)
- Added `allow-focus` attribute for Switch, #7494 (by @breadadams)
### 1.4.6
*2017-09-27*