Commit Graph

1912 Commits

Author SHA1 Message Date
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
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
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
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
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
37a4b374f1 Update checkbox and tree 2016-08-12 14:45:06 +08:00
baiyaaaaa
a4a0701ab5 update autocomplete 2016-08-12 14:43:50 +08:00
qingwei.li
0c8159cd8a Fix conflict 2016-08-12 10:09:58 +08:00
FuryBean
af71d7b708 Merge pull request #54 from baiyaaaaa/next
fix autocomplete
2016-08-12 10:06:28 +08:00
baiyaaaaa
1e7809106b fix autocomplete 2016-08-11 17:28:10 +08:00
FuryBean
d1319b2fea Merge pull request #53 from Leopoldthecoder/next
update input-number and slider
2016-08-11 16:59:26 +08:00
Leopoldthecoder
c641355e4f update input-number and slider 2016-08-11 15:51:13 +08:00
qingwei.li
3b067e44c3 Update breadcrumb 2016-08-11 15:30:08 +08:00
qingwei.li
6ad98f7ec1 update time/date picker 2016-08-11 12:20:29 +08:00
Leopoldthecoder
4fcfa04a9b relocate variable declaration 2016-08-11 11:11:59 +08:00
Leopoldthecoder
dcffbbbe0d update alert and notification 2016-08-11 10:40:34 +08:00
FuryBean
300f0a7d33 Merge pull request #48 from Leopoldthecoder/next
update msgbox
2016-08-10 18:24:35 +08:00
Leopoldthecoder
08fd95571f update msgbox 2016-08-10 18:11:56 +08:00
qingwei.li
096b3559c6 update time-picker 2016-08-09 10:10:33 +08:00
FuryBean
b3134b92b4 Merge pull request #41 from eleme/feat/update-popper
update popover and tooltip
2016-08-08 17:47:59 +08:00
Leopoldthecoder
67ea53062e apply v-model in el-dialog 2016-08-08 17:22:21 +08:00
Leopoldthecoder
ca59b21011 update dialog 2016-08-08 13:59:26 +08:00
qingwei.li
4e46e55e11 Optimized code 2016-08-05 17:41:08 +08:00
qingwei.li
1c1417f536 update popover and tooltip 2016-08-05 17:02:01 +08:00
Leopoldthecoder
f80f2d55e3 update switch 2016-08-04 19:56:54 +08:00
FuryBean
47293a131d Merge pull request #35 from eleme/feat/next-pagination
update pagination
2016-07-29 18:25:06 +08:00
qingwei.li
3140e784b9 update pagination 2016-07-29 17:46:16 +08:00
baiyaaaaa
153220215f update menu, tag, button, progress 2016-07-29 16:50:26 +08:00
qingwei.li
a733f7835e update select and input 2016-07-28 18:37:14 +08:00
qingwei.li
8ec81da71b add clickoutside 2016-07-28 12:20:21 +08:00
qingwei.li
287868d165 update route 2016-07-27 17:05:28 +08:00
qingwei.li
e320f43c2d Initial commit 2016-07-27 14:15:02 +08:00