Leopoldthecoder 6d3636fbac Merge remote-tracking branch 'eleme/dev' into carbon ...

# Conflicts:
#	CHANGELOG.en-US.md
#	CHANGELOG.zh-CN.md
#	examples/app.vue
#	examples/index.tpl
#	examples/versions.json
#	package.json
#	packages/dropdown/src/dropdown.vue
#	packages/theme-default/package.json
#	packages/theme-default/src/date-picker/date-picker.css
#	src/index.js

2017-10-24 18:48:54 +08:00

..

assets

update landing page for 2.0

2017-10-23 05:38:15 -05:00

components

Autocomplete: add value-key (#7671)

2017-10-24 02:24:35 -05:00

docs

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

2017-10-24 18:48:54 +08:00

dom

Initial commit

2016-07-27 14:15:02 +08:00

i18n

update landing page for 2.0

2017-10-23 05:38:15 -05:00

pages/template

Autocomplete: add value-key (#7671)

2017-10-24 02:24:35 -05:00

play

DatePicker/TimePicker: add chalk theme (#7169)

2017-09-22 23:46:37 -05:00

app.vue

update beta notice

2017-10-20 03:53:40 -05:00

bus.js

docs style groundwork (#7281)

2017-09-28 22:36:38 -05:00

entry.js

update landing page for 2.0

2017-10-23 05:38:15 -05:00

favicon.ico

add favicon

2016-11-09 18:24:00 +08:00

icon.json

Icon: fix mobile-phone class name

2017-10-23 21:18:11 -05:00

index.tpl

Changelog: update for 1.4.8 (#7683)

2017-10-24 05:19:04 -05:00

nav.config.json

update dependencies (#7476)

2017-10-16 14:07:24 +08:00

play.js

Tree: add chalk theme (#6901)

2017-09-13 22:34:26 -05:00

route.config.js

feat: split doc files (#4792)

2017-05-12 16:33:36 +08:00

versions.json

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

2017-10-24 18:48:54 +08:00