Commit graph

1320 commits

Author SHA1 Message Date
Aresn
8711920b2e Merge pull request #2185 from md678685/patch-1
Fix some English grammar in README
2017-10-24 19:14:01 -05:00
md678685
692be62c0a Fix some English grammar in README
This PR changes some of the English sentences in the `README.md` to sound more natural. I have tried to keep the structure as close as possible to the original. If anything sounds confusing, please reply below.

这个PR改变了`README.md`中的一些英文句子,使其听起来更自然。 我试图保持结构尽可能接近原来。 如有任何疑问,请在下面回覆。
2017-10-24 21:06:04 +01:00
Aresn
2be2b97416 Merge pull request #2184 from SergioCrisostomo/fix-tree-examples
fix dom rendering when adding new nodes in example
2017-10-24 07:46:14 -05:00
Sergio Crisostomo
da76a837e3 fix dom rendering problems 2017-10-24 14:08:52 +02:00
梁灏
b31aab71d2 Tree add async loading 2017-10-24 18:14:22 +08:00
梁灏
76a4781417 fixed #2128 2017-10-24 16:48:28 +08:00
houyl
ccf544dcc2 Merge branch 'master' of https://github.com/iview/iview into 2.0
Update carousel component: add loop and radiusDot property
# Conflicts:
#	package.json
#	src/components/date-picker/picker.vue
#	src/components/select/select.vue
2017-10-24 16:47:12 +08:00
梁灏
9b24f1ab7b Tree add Render function
fixed #2133
fixed #1784
fixed #1333
fixed #1362
2017-10-24 16:20:09 +08:00
梁灏
ecf6c2fae9 update dependence 2017-10-24 15:47:07 +08:00
Aresn
c89e0e1791 Merge pull request #2090 from SergioCrisostomo/refactor-tree
Refactor tree
2017-10-24 02:44:19 -05:00
Sergio Crisostomo
0a8f9b43f6 Keep original data pointers and correct if clause 2017-10-24 09:30:48 +02:00
Sergio Crisostomo
d44420be72 refactor and make indeterminate accessible outside tree 2017-10-24 09:30:48 +02:00
Sergio Crisostomo
94d177cc83 add width to expand icon so we can click on it easier 2017-10-24 09:30:48 +02:00
梁灏
7053de4e78 update demo 2017-10-24 09:52:42 +08:00
Aresn
c61015d19d Merge pull request #2172 from SergioCrisostomo/fix-2164
format string dates in daterange also
2017-10-23 20:22:51 -05:00
梁灏
a5f4a1d458 fixed #1922 2017-10-23 23:08:40 +08:00
Sergio Crisostomo
65255c9637 fix date formatting when strings are supplied to DatePicker 2017-10-23 15:53:12 +02:00
梁灏
6c634aa631 fixed #2078 2017-10-23 19:01:47 +08:00
梁灏
c2d74eca9a fixed #2100 2017-10-23 18:26:42 +08:00
Aresn
b92a1b5c99 Merge pull request #2170 from SergioCrisostomo/use-locale-formated-year-month
Correct month calculation and add specs for date-picker labels
2017-10-23 04:22:44 -05:00
Aresn
6261a49dfd Merge pull request #2171 from iview/pr/2124
update Tag style for check
2017-10-23 04:19:11 -05:00
Aresn
a1553a9cc4 Merge pull request #2124 from daiyanze/feature/checkable_tag
Feature/checkable tag (追加功能:可选标签)
2017-10-23 04:17:50 -05:00
梁灏
7afb40618c update Tag style for check 2017-10-23 17:14:29 +08:00
Sergio Crisostomo
3ed12b4e43 Correct month calculation and add specs for date-picker labels 2017-10-23 11:13:06 +02:00
Aresn
fd79f102db Update tag.vue 2017-10-23 03:57:05 -05:00
梁灏
5064c7b3fe update ja-JP 2017-10-23 16:52:30 +08:00
Aresn
4c6d996226 Update tag.vue 2017-10-23 03:40:39 -05:00
梁灏
b75ad4a120 fixed #1700 2017-10-23 14:12:02 +08:00
梁灏
6ed0cd7377 update Tree demo 2017-10-23 11:55:35 +08:00
梁灏
0e31618388 update demo 2017-10-23 11:00:20 +08:00
梁灏
ba1422cd62 update zh-TW 2017-10-23 09:52:56 +08:00
Aresn
f672ae027c Merge pull request #2097 from SergioCrisostomo/use-locale-formated-year-month
use date.toLocaleDateString to format year/month
2017-10-22 20:29:51 -05:00
梁灏
0f65109372 update 2017-10-23 09:26:41 +08:00
梁灏
a730a8490a update Tabs 2017-10-20 17:44:58 +08:00
Aresn
ec1a5e2684 Merge pull request #2156 from marxy/tabs-scroll
Tabs add scroll
2017-10-20 04:38:28 -05:00
梁灏
758bd768cd Merge branch '2.0' of https://github.com/iview/iview into 2.0 2017-10-20 16:56:33 +08:00
梁灏
45103ca480 fixed #2066 2017-10-20 16:53:59 +08:00
marxy
be3fbd2499 Tabs add scroll 2017-10-20 16:30:44 +08:00
Aresn
e15746f623 update dependence 2017-10-20 03:18:08 -05:00
梁灏
485a9039d5 fixed #2149 2017-10-20 15:36:43 +08:00
Aresn
cbe5ccfc8a Merge pull request #2114 from SergioCrisostomo/improve-csv
Improve export to CSV functionality
2017-10-19 22:47:33 -05:00
Aresn
11baa9a164 Merge pull request #2136 from SergioCrisostomo/fix-scroll-event
add missing event in callback
2017-10-19 05:45:31 -05:00
Sergio Crisostomo
a3336b3816 add missing event in callback 2017-10-19 10:41:19 +02:00
daiyanze
62bf2b3ceb Modify: example of tags 2017-10-18 17:21:52 +09:00
daiyanze
dc39cc3163 Feature: Checkable tag 2017-10-18 17:13:06 +09:00
梁灏
2e8add2fb3 release 2.5.1 2017-10-18 08:58:16 +08:00
Aresn
95dfbe1bc4 Merge pull request #2120 from SergioCrisostomo/fix-2119
correct behaviour when initialising date-picker with a empty string
2017-10-17 19:52:02 -05:00
Sergio Crisostomo
5d1c24c7f4 correct behaviour when initialising date-picker with a empty string 2017-10-17 15:13:42 +02:00
Sergio Crisostomo
2537c26d18 add dateLabel to time panel 2017-10-17 14:26:12 +02:00
Sergio Crisostomo
b27858ddb5 add date panel label format logic 2017-10-17 13:09:04 +02:00