github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity
67 Commits
7 Branches
148 Tags
161 MiB
Commit Graph

67 Commits (62e3e768c3bbd5cfdc5e1d54f3d05692a2fed7c1)

Author SHA1 Message Date
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
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
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
FuryBean cf16180a71 Merge pull request #50 from eleme/feat/next-datepicker 
Feat/next datepicker
 2016-08-12 10:15:40 +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
FuryBean de8c3b8b46 Merge pull request #52 from eleme/feat/next-breadcrumb 
Update breadcrumb
 2016-08-11 15:35:14 +08:00
qingwei.li 3b067e44c3 Update breadcrumb 2016-08-11 15:30:08 +08:00
qingwei.li 4d07a69435 Remove cascader 2016-08-11 15:17:14 +08:00
qingwei.li 5c90dbd297 Merge branch 'next' of github.com:eleme/element-ui into next 2016-08-11 15:13:38 +08:00
qingwei.li 0d5bcfdd92 Remove cascader 2016-08-11 15:13:10 +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
FuryBean c6cf12ff12 Merge pull request #49 from Leopoldthecoder/next 
update alert and notification
 2016-08-11 10:56:50 +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