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

553 Commits (6dd09cc11d4959ffbed7fffaf77a28e5f66b7812)

Author SHA1 Message Date
FuryBean 8eb0ab0a91 Merge pull request #53 from QingWei-Li/fix/time-picker 
TimePicker: set default value
 2016-09-10 11:13:46 +08:00
qingwei.li 367018bb9e TimePicker: set default value 2016-09-10 10:01:48 +08:00
十界 0ab3eac933 Tag: update doc 2016-09-10 00:36:27 +08:00
cinwell.li 35be693bbc Merge pull request #47 from Leopoldthecoder/master 
fix a slider bug
 2016-09-09 15:18:14 +08:00
Leopoldthecoder de94e0c0bc fix a slider bug 2016-09-09 14:27:49 +08:00
qingwei.li a2b361e730 Upload: update doc 2016-09-09 14:11:07 +08:00
Leopoldthecoder 3b0477b90f update pagination 2016-09-09 12:02:16 +08:00
FuryBean 65d6938ddf Merge pull request #34 from Leopoldthecoder/master 
fix tree bugs
 2016-09-08 12:33:03 +08:00
qingwei.li a77b6850e1 Popover: add reference slot 2016-09-08 11:21:17 +08:00
baiyaaaaa 22e7a75508 Merge pull request #27 from baiyaaaaa/master 
docs update
 2016-09-08 10:21:14 +08:00
Leopoldthecoder 0b91eafb1b update Badge/Pagination/Progress/Table/Tag/Tree doc 2016-09-08 09:15:52 +08:00
杨奕 9caa78bda1 Merge pull request #26 from QingWei-Li/master 
Fix badge, card, tooltip
 2016-09-08 09:14:34 +08:00
SkyAo ec8c0af20a Merge pull request #28 from Leopoldthecoder/master 
add footer-nav
 2016-09-07 19:11:32 +08:00
SkyAo f8cd9bdfe4 update document of basic 2016-09-07 18:51:03 +08:00
Leopoldthecoder 74abc40bf3 add footer-nav 2016-09-07 18:39:09 +08:00
qingwei.li 1683461d91 Menu,Breadcrumb,Steps,Tabs: update doc and fix style 2016-09-07 18:36:50 +08:00
baiyaaaaa 85160822fa docs update 2016-09-07 18:26:46 +08:00
杨奕 267f3c20bc Merge pull request #19 from baiyaaaaa/update-progress 
update progress
 2016-09-07 18:25:32 +08:00
baiyaaaaa 38cb32609c update progress 2016-09-07 18:06:47 +08:00
qingwei.li 3ca190b42c Card: update doc 2016-09-07 16:24:22 +08:00
qingwei.li af28fa68cd Badge: update doc 2016-09-07 16:19:54 +08:00
Chris.xu 92ba1eb789 摸态→模态 
摸态→模态
 2016-09-07 14:56:20 +08:00
Leopoldthecoder 96f403badb minor doc updates/guarantee _self returns the right vm 2016-09-06 19:33:37 +08:00
SkyAo fecc5ac17a update icon/input-number/pagination/button/dropdown docs 2016-09-06 17:26:04 +08:00
杨奕 9b9f09ba47 Merge pull request #11 from csvwolf/master 
Fix docs according to UED
 2016-09-06 14:11:00 +08:00
SkyAo 604ee200b3 fix docs according to UED 2016-09-06 14:07:26 +08:00
baiyaaaaa bb1ea77af5 Merge pull request #7 from Leopoldthecoder/master 
update Message animation and Rate/Switch doc
 2016-09-05 23:27:34 +08:00
Leopoldthecoder d2bad291af update Message animation and Rate/Switch doc 2016-09-05 15:34:53 +08:00
baiyaaaaa 6a558dbe48 menu fixed 2016-09-05 12:40:11 +08:00
baiyaaaaa 4d8f8e732f update tree docs 2016-09-04 10:27:09 +08:00
baiyaaaaa 8c99215785 Merge pull request #141 from csvwolf/next 
fix docs of breadcrumb/button/card/checkbox
 2016-09-03 19:26:40 +08:00
qingwei.li b808879ddb Popover: fix visible 2016-09-02 19:32:17 +08:00
SkyAo 1b10862c42 fix docs of breadcrumb/button/card/checkbox 2016-09-02 16:09:36 +08:00
Leopoldthecoder 8de485ad82 cancel inline-style for table <td> white-space 2016-09-02 15:41:52 +08:00
Leopoldthecoder 26037506a4 fix popover 2016-09-02 14:51:01 +08:00
Leopoldthecoder 07a0943d6b update message box prompt style 2016-09-02 13:58:54 +08:00
baiyaaaaa 2d177056ff fix input-number 2016-09-02 12:12:03 +08:00
Leopoldthecoder 7b79fe3a75 minor doc updates 2016-09-01 17:48:33 +08:00
qingwei.li 8394318122 Table: fix render static data 
Table
 2016-09-01 15:59:28 +08:00
cinwell.li 11b86871ef Merge pull request #133 from eleme/feat-upload 
add onSuccess && onError hook
 2016-09-01 13:57:38 +08:00
baiyaaaaa 88c11b29e4 add onSuccess && onError hook 2016-09-01 13:49:09 +08:00
baiyaaaaa 5e10f12947 add color && typo docs 2016-09-01 12:34:33 +08:00
baiyaaaaa 578a2c0b82 update menu docs 2016-09-01 10:48:06 +08:00
qingwei.li f123b80b79 Step(doc): fix doc 2016-08-31 18:01:32 +08:00
baiyaaaaa aaf9999b90 Merge pull request #126 from QingWei-Li/next 
Button: add nativeType attribute
 2016-08-31 13:32:28 +08:00
baiyaaaaa 61558fce82 update docs 2016-08-31 12:42:44 +08:00
qingwei.li 4e78b73396 Button: add nativeType attribute 2016-08-31 12:10:29 +08:00
杨奕 cc7bfc0124 Merge pull request #120 from QingWei-Li/next 
Table: Fix static render fail
 2016-08-30 22:02:56 -05:00
baiyaaaaa 1fd574c5c4 add quickstart and develop page 2016-08-30 19:30:58 +08:00
qingwei.li 9bb4343d3f Tree: Fix render bug 2016-08-30 19:06:15 +08:00
baiyaaaaa ac8bc3a874 Merge pull request #115 from Leopoldthecoder/next 
DatePicker/DatetimePicker doc update
 2016-08-29 19:58:56 +08:00
baiyaaaaa c61c1472af Merge pull request #117 from eleme/feat/upload 
update upload
 2016-08-29 19:58:37 +08:00
baiyaaaaa 538e2934c5 update form docs 2016-08-29 19:56:57 +08:00
baiyaaaaa ac1bebf266 update upload 2016-08-29 19:48:14 +08:00
Leopoldthecoder eb03154839 DatePicker/DatetimePicker doc update 2016-08-29 19:04:31 +08:00
baiyaaaaa 57b33a3e36 Merge pull request #112 from Leopoldthecoder/next 
Rate/Slider/Message doc update
 2016-08-29 18:52:00 +08:00
SkyAo 9919ef5c8a change all rewrited components documents to new templates 2016-08-29 10:58:37 +08:00
Leopoldthecoder 62a1df616a link to variables 2016-08-29 10:53:00 +08:00
baiyaaaaa a0bbda7193 fixed autocomplete 2016-08-28 00:14:45 +08:00
Leopoldthecoder b527ca887e TimePicker doc update 2016-08-27 21:24:16 +08:00
Leopoldthecoder 1a2566117d Rate/Slider/Message doc update 2016-08-27 16:06:22 +08:00
FuryBean 7b860de92b Merge pull request #111 from Leopoldthecoder/next 
Alert/Select/Notification/Table doc update
 2016-08-26 21:49:28 +08:00
杨奕 a37c361eb4 Merge pull request #109 from eleme/feat/update-grid 
update grid
 2016-08-26 06:55:42 -05:00
Leopoldthecoder ff9a5ba530 Alert/Select/Notification/Table doc update 2016-08-26 19:46:45 +08:00
baiyaaaaa 2a8c368b0b update grid 2016-08-26 15:49:12 +08:00
SkyAo 2e0a141943 fix encoding apostrophes/some components change to new template 2016-08-26 15:37:38 +08:00
Leopoldthecoder eb713f80e6 update custom background table 2016-08-26 14:01:14 +08:00
FuryBean 0286100371 Merge pull request #100 from QingWei-Li/feat/upgrade-tooltip 
Tooltip: Add openDelay
 2016-08-26 10:28:33 +08:00
baiyaaaaa 073b791519 Merge pull request #101 from QingWei-Li/feat/next-buglist0825 
Fix buglist 0825
 2016-08-26 10:16:46 +08:00
qingwei.li 561f70142f Poppover(doc): Undeclared 'model' 2016-08-25 16:49:31 +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
Leopoldthecoder 1b63c03dd7 add footer and demo-block 2016-08-25 12:29:51 +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
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
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
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
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 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 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
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
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 37a4b374f1 Update checkbox and tree 2016-08-12 14:45:06 +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
Leopoldthecoder c641355e4f update input-number and slider 2016-08-11 15:51:13 +08:00
qingwei.li 6ad98f7ec1 update time/date picker 2016-08-11 12:20:29 +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 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
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 287868d165 update route 2016-07-27 17:05:28 +08:00
qingwei.li e320f43c2d Initial commit 2016-07-27 14:15:02 +08:00