Commit Graph

187 Commits

Author SHA1 Message Date
SkyAo
066c8f727f finish documents of basic & fix bug 2016-08-19 14:45:08 +08:00
FuryBean
df1e2a071c Merge pull request #76 from csvwolf/next
add docs of messagebox/tooltip/tag...
2016-08-18 17:42:12 +08:00
SkyAo
a07269530f add docs of messagebox/tooltip/tag... 2016-08-18 17:29:11 +08:00
FuryBean
454bb52f93 Merge pull request #75 from Leopoldthecoder/next
add rate
2016-08-18 16:09:39 +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
FuryBean
383c60966d Merge pull request #74 from eleme/feat/input-group
update input && input-group
2016-08-17 18:10:16 +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
FuryBean
145cb4dbf7 Merge pull request #72 from eleme/feat/next-badge
Feat/next badge
2016-08-17 14:26:13 +08:00
qingwei.li
f0503c87a3 badge: dot => isDot 2016-08-17 14:16:15 +08:00
Leopoldthecoder
f301f215c6 Merge branch 'next' of github.com:eleme/element-ui into next 2016-08-17 14:09:12 +08:00
Leopoldthecoder
cc0ca6851b remove select unnecessary input emits 2016-08-17 14:08:54 +08:00
qingwei.li
cc0934d89b Fix dot
fix style
2016-08-17 14:06:04 +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
FuryBean
6014c4d53d Merge pull request #69 from csvwolf/next
add alert & button docs and fix alert close event
2016-08-17 10:30:25 +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
4927e30d3c remove unused code 2016-08-16 16:11:43 +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
FuryBean
37ebca5ba7 Merge pull request #66 from Leopoldthecoder/next
add message
2016-08-15 16:18:08 +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
FuryBean
aba8b84722 Merge pull request #64 from eleme/feat/fix-eventname
update pagination and select event name
2016-08-15 15:24:11 +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
FuryBean
0de1650c63 Merge pull request #58 from eleme/feat/next-tabs
Feat/next tabs
2016-08-15 11:30:37 +08:00
qingwei.li
eb60126636 Update tabs
build entry.js

index => name

fix tab doc
2016-08-15 10:51:24 +08:00
cinwell.li
05081a7424 Merge pull request #59 from eleme/feat/next-row
Update Row and Col
2016-08-12 18:29:24 +08:00
cinwell.li
5ce5efde29 Merge pull request #60 from Leopoldthecoder/next
fix a compatibility bug of loading
2016-08-12 18:20:48 +08:00
Leopoldthecoder
7de121ade5 fix a compatibility bug of loading 2016-08-12 18:02:35 +08:00
qingwei.li
05bfb6332b Update Row and Col 2016-08-12 16:32:47 +08:00
FuryBean
d607187d85 Merge pull request #56 from eleme/feat/next-tree
Update checkbox and tree
2016-08-12 15:56:09 +08:00
FuryBean
9c0912745f Merge pull request #57 from Leopoldthecoder/next
update loading
2016-08-12 15:55:42 +08:00
Leopoldthecoder
e28f33905d update loading 2016-08-12 15:49:47 +08:00
qingwei.li
4d608fc9da Fix conflict 2016-08-12 14:49:14 +08:00
qingwei.li
74b76444e4 update index file 2016-08-12 14:47:45 +08:00
baiyaaaaa
9b46a3fd08 Merge pull request #55 from eleme/feat-dropdown
update autocomplete
2016-08-12 14:45:43 +08:00