Commit Graph

15 Commits (0eef790e6be63639bedb45551ec4cf6ac165fc8d)

Author SHA1 Message Date
tangjinzhou da0f17d1b6 Merge remote-tracking branch 'origin/master' into feat-1.4.0
# Conflicts:
#	components/affix/index.jsx
#	components/alert/index.jsx
#	components/back-top/index.jsx
#	components/carousel/index.jsx
#	components/cascader/index.jsx
#	components/comment/index.jsx
#	components/config-provider/index.jsx
#	components/divider/index.jsx
#	components/drawer/index.jsx
#	components/form/Form.jsx
#	components/input-number/index.jsx
#	components/menu/index.jsx
#	components/modal/confirm.js
#	components/modal/index.js
#	components/popconfirm/index.jsx
#	components/popover/index.jsx
#	components/rate/index.jsx
#	components/steps/index.jsx
#	components/switch/index.jsx
#	components/time-picker/index.jsx
#	components/tree-select/index.jsx
#	site/components.js
2019-08-28 22:36:44 +08:00
tanjinzhou c9f1c26693 chore: add base.vue inconsistent vue version 2019-08-28 10:50:19 +08:00
tangjinzhou ecf7c8b42c fix: update icon focusable="false" #924 2019-07-07 21:27:16 +08:00
wangxueliang 5d8d9248a3 test: update snapshots 2019-05-18 15:49:50 +08:00
wangxueliang 0566ae23e1 test: update snapshots 2019-04-09 20:39:49 +08:00
wangxueliang 16409c6ed1 feat: update comment、divider、grid 2019-03-15 15:12:28 +08:00
wangxueliang a4d415392f feat: update style css to 3.13.6 2019-03-05 13:16:32 +08:00
三点包子 e0a9209b6a test: add comment test and update snapshots (#429) 2019-01-23 09:46:04 +08:00
tangjinzhou ffb2a593b1 style: lint add semi and prettier 2019-01-12 12:46:29 +08:00
tangjinzhou ad0727898e test: update snapshots 2019-01-05 16:24:52 +08:00
tangjinzhou e706170669 test: update snapshots 2019-01-03 21:03:39 +08:00
tangjinzhou 14dfebab0b feat: update style to 3.11.6 2019-01-02 21:01:56 +08:00
tangjinzhou f59777501f feat: update comment 2019-01-02 11:03:46 +08:00
wangxueliang 13b78b9543 docs: comment doc 2019-01-01 15:37:10 +08:00
wangxueliang 429e7f4b72 feat: add comment 2019-01-01 15:33:43 +08:00