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

351 Commits (33a551d708ecdab801d4d13cbc6f0b88913e927f)

Author SHA1 Message Date
qingwei.li 561f70142f Poppover(doc): Undeclared 'model' 2016-08-25 16:49:31 +08:00
Leopoldthecoder 8c71f10092 Merge branch 'next' of github.com:eleme/element-ui into next 
# Conflicts:
#	examples/app.vue
#	examples/nav.config.json
#	examples/pages/component.vue
#	examples/pages/design.vue
#	examples/pages/guide.vue
#	examples/pages/nav.vue
#	examples/pages/resource.vue
#	examples/route.config.js
 2016-08-25 16:44:07 +08:00
Leopoldthecoder 8422995141 update loading 2016-08-25 16:37:55 +08:00
qingwei.li 9743c8b4a3 Table: fix trigger double selectionchange 2016-08-25 15:08:15 +08:00
qingwei.li 5954d9899f Table: fix single selection mode highlight class 2016-08-25 15:03:57 +08:00
qingwei.li 7bdda0b994 Table: multiple selection mode failure 2016-08-25 14:47:39 +08:00
baiyaaaaa b51aeab34b Merge pull request #102 from baiyaaaaa/next-doc 
Next doc
 2016-08-25 14:39:20 +08:00
baiyaaaaa 2d9a77b474 index 2016-08-25 14:38:44 +08:00
qingwei.li 6eaa9ef545 Table: get context in custom template 2016-08-25 13:43:09 +08:00
baiyaaaaa 4247932988 component nav 2016-08-25 12:30:21 +08:00
baiyaaaaa 0d6fdd2bd6 component side-nav 2016-08-25 12:30:21 +08:00
Leopoldthecoder 1b63c03dd7 add footer and demo-block 2016-08-25 12:29:51 +08:00
baiyaaaaa 3d90f2a3c3 component header 2016-08-25 12:26:03 +08:00
Leopoldthecoder e86f573ce6 update router 2016-08-25 12:26:03 +08:00
qingwei.li 9a5650f3db Tooltip: lazy => openDelay 2016-08-25 12:25:52 +08:00
qingwei.li 06f16f78e7 Table: render asynchronous data 2016-08-25 11:51:25 +08:00
cinwell.li c41f8d5bb7 Merge pull request #99 from csvwolf/next 
fix radio logic & radio document
 2016-08-25 09:04:11 +08:00
qingwei.li c0aecc9ce1 Tooltip: Add lazy 2016-08-25 09:02:53 +08:00
FuryBean 2d05bdea49 Merge pull request #98 from QingWei-Li/feat/fix-buglist 
Feat/fix buglist
 2016-08-24 20:31:31 +08:00
qingwei.li 39bf244190 Fix Option 'label' prop 2016-08-24 18:52:07 +08:00
SkyAo b1074b737a fix radio logic & radio document 2016-08-23 18:32:28 +08:00
qingwei.li 01f6b9da7d Fix DatePicker style 2016-08-23 17:44:24 +08:00
FuryBean b8a9fd5916 Merge pull request #89 from csvwolf/next 
edit dropdown/message/tab docs
 2016-08-23 16:44:36 +08:00
qingwei.li 951c3de1bf Fix DatePicker button 2016-08-23 16:15:52 +08:00
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
qingwei.li a44c25dfd4 Merge branch 'next' into feat/fix-buglist 2016-08-23 15:09:12 +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
杨奕 64315b0954 Merge pull request #94 from QingWei-Li/next 
Fix markdown demo token
 2016-08-23 00:53:02 -05:00
qingwei.li 6975c481fe Fix table 'styleSheet' is undefined 2016-08-23 13:51:36 +08:00
qingwei.li 5c4350914e Fix markdown demo token 2016-08-23 13:46:51 +08:00
FuryBean 127db97b87 Merge pull request #93 from eleme/feat/menu 
menu item group
 2016-08-23 13:41:41 +08:00
qingwei.li 228fee1e16 Fix DatePicker panel bug & Fix menu router prop 2016-08-23 13:29:45 +08:00
baiyaaaaa 03f34f7d32 menu item group 2016-08-23 11:32:37 +08:00
baiyaaaaa c927dfb1da Merge pull request #92 from eleme/feat/fixed-tab 
fixed tab bug
 2016-08-22 18:58:09 +08:00
baiyaaaaa e113f46900 fixed tab bug 2016-08-22 18:54:38 +08:00
Leopoldthecoder 79d92a8760 update router 2016-08-22 17:49:20 +08:00
FuryBean 07b9e00fa5 Merge pull request #87 from QingWei-Li/feat/next-fix-table 
Feat/next fix table
 2016-08-22 16:41:20 +08:00
cinwell.li a0a3c57eec Merge pull request #83 from eleme/feat/next-build 
Update cooking config
 2016-08-22 15:51:56 +08:00
cinwell.li 7393c5241f Merge pull request #84 from eleme/feat/next-update-markdown 
update markdown config
 2016-08-22 15:51:38 +08:00
qingwei.li 699d288ec1 update step style 2016-08-22 15:50:43 +08:00
baiyaaaaa 0527a79ab7 Merge pull request #86 from eleme/feat/fixed-tab 
fixed tab bug
 2016-08-22 15:39:50 +08:00
qingwei.li 1df2920f4f fix table prop bug 2016-08-22 15:17:32 +08:00
qingwei.li 33e39cbacb Update cooking config 
update config
 2016-08-22 14:32:04 +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