Commit Graph

74 Commits (b8a9fd59164ac092561355dcc263ee261cce4da7)

Author SHA1 Message Date
SkyAo 46835e95c5 Merge remote-tracking branch 'origin/next' into next 2016-08-23 15:52:57 +08:00
SkyAo 61a34e6627 finish nav and data docs except tree 2016-08-23 15:32:45 +08:00
SkyAo d46f8df927 edit dropdown/message/tab docs 2016-08-23 15:32:45 +08:00
baiyaaaaa e5e6140d37 Merge pull request #95 from eleme/feat/fixed-tab
tab events
2016-08-23 15:07:56 +08:00
baiyaaaaa 645cc085c9 tab events 2016-08-23 14:49:40 +08:00
baiyaaaaa 03f34f7d32 menu item group 2016-08-23 11:32:37 +08:00
baiyaaaaa e113f46900 fixed tab bug 2016-08-22 18:54:38 +08:00
baiyaaaaa 0527a79ab7 Merge pull request #86 from eleme/feat/fixed-tab
fixed tab bug
2016-08-22 15:39:50 +08:00
FuryBean da8a014b90 Merge pull request #85 from Leopoldthecoder/next
update message-box, select and slider docs
2016-08-22 14:31:38 +08:00
FuryBean d837afd7ce Merge pull request #79 from eleme/feat/next-steps
Add Steps component
2016-08-22 14:30:06 +08:00
FuryBean cd7ad1c903 Merge pull request #77 from csvwolf/next
finish documents of basic & fix bug
2016-08-22 14:29:10 +08:00
Leopoldthecoder 4a6765c220 update message-box, select and slider docs 2016-08-22 14:07:53 +08:00
qingwei.li ec2e06037e Add Steps component
Update docs

Clear space

Update doc
2016-08-22 12:51:42 +08:00
baiyaaaaa 0092a38419 fixed tab bug 2016-08-22 12:42:47 +08:00
baiyaaaaa a90e1769d0 Merge pull request #82 from eleme/feat/upload
update upload
2016-08-22 12:04:11 +08:00
baiyaaaaa 019b325a3a Merge pull request #81 from Leopoldthecoder/next
fix select bugs
2016-08-22 10:22:06 +08:00
baiyaaaaa 0aaf2df436 update upload 2016-08-21 10:01:21 +08:00
Leopoldthecoder 139a30745c fix select bugs 2016-08-20 15:00:01 +08:00
FuryBean 2ceff8709e Merge pull request #78 from Leopoldthecoder/next
add transition-group in select
2016-08-19 21:50:48 +08:00
FuryBean 1c5c26b4bf Merge pull request #71 from eleme/feat/form
update form
2016-08-19 20:43:26 +08:00
SkyAo cfaa0ab858 add validator in progress & docs update 2016-08-19 18:54:18 +08:00
Leopoldthecoder 1e317a3c3b add transition-group in select 2016-08-19 18:20:54 +08:00
SkyAo 066c8f727f finish documents of basic & fix bug 2016-08-19 14:45:08 +08:00
SkyAo a07269530f add docs of messagebox/tooltip/tag... 2016-08-18 17:29:11 +08:00
Leopoldthecoder 33b54f4436 update rate 2016-08-18 15:53:54 +08:00
Leopoldthecoder 05e7ea8311 Merge branch 'next' of github.com:eleme/element-ui into next
# Conflicts:
#	src/index.js
2016-08-17 19:58:59 +08:00
Leopoldthecoder 1c3d119caf add rate 2016-08-17 19:56:39 +08:00
baiyaaaaa 80ae828639 update input && input-group 2016-08-17 17:58:26 +08:00
baiyaaaaa 22bd899a41 update form 2016-08-17 15:04:20 +08:00
qingwei.li f0503c87a3 badge: dot => isDot 2016-08-17 14:16:15 +08:00
qingwei.li e99a7b3d6e Fix conflicts 2016-08-17 13:56:23 +08:00
qingwei.li f8549e9084 Add badge component 2016-08-17 13:53:56 +08:00
FuryBean ebc6be77aa Merge pull request #70 from eleme/feat/next-card
Add card component
2016-08-17 11:22:22 +08:00
qingwei.li 62bd4b2b85 Update style & rename fecha.js to date.js 2016-08-17 11:11:54 +08:00
FuryBean 62e3e768c3 Merge pull request #68 from eleme/feat/next-table
Feat/next table
2016-08-17 11:05:53 +08:00
qingwei.li e0a6241675 Add card component 2016-08-16 18:51:53 +08:00
SkyAo d35e43f90e add alert & button docs and fix alert close event 2016-08-16 17:19:34 +08:00
qingwei.li cae2767cda Update vue-rc.2 2016-08-16 16:52:43 +08:00
qingwei.li c95b125762 fix readme 2016-08-16 16:25:19 +08:00
qingwei.li 519a64b667 Fix conflict 2016-08-16 16:09:10 +08:00
qingwei.li bca756d8dc Update table 2016-08-16 16:07:18 +08:00
Leopoldthecoder 609901ae7a Merge branch 'next' of github.com:eleme/element-ui into next
# Conflicts:
#	bin/build-entry.js
#	src/index.js
2016-08-15 16:13:59 +08:00
Leopoldthecoder 557a09c647 add message 2016-08-15 16:10:12 +08:00
FuryBean cb68b3d48f Merge pull request #65 from eleme/feat/checkbox
fix checkbox
2016-08-15 15:24:26 +08:00
qingwei.li 9a0f7e30c9 update pagination and select event name 2016-08-15 15:16:04 +08:00
baiyaaaaa 8dde5b0d24 fix checkbox 2016-08-15 15:04:13 +08:00
FuryBean 0edd7b428c Merge pull request #63 from eleme/feat/radio
update radio
2016-08-15 12:19:59 +08:00
baiyaaaaa 4c37face35 update radio 2016-08-15 12:14:58 +08:00
Leopoldthecoder 7e05dab840 init message 2016-08-15 11:51:25 +08:00
qingwei.li eb60126636 Update tabs
build entry.js

index => name

fix tab doc
2016-08-15 10:51:24 +08:00