mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-12-22 14:44:47 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity
28,327 Commits 23 Branches 734 Tags 437 MiB
e229523073
Commit Graph

2096 Commits

Author SHA1 Message Date
afc163
1e1c6d1c72 Merge branch 'master' into antd-3.0 2017-11-16 19:58:20 +08:00
afc163
9a9196ca10 Fix doc 2017-11-15 17:02:49 +08:00
afc163
11a3ce4cc6 multiple emails 2017-11-15 17:01:19 +08:00
afc163
e0be248847 Add antue 2017-11-14 23:05:51 +08:00
afc163
4535800fa3 update 2017-11-14 22:42:47 +08:00
afc163
bf36ebdf5e Merge branch 'master' into antd-3.0 2017-11-13 21:24:32 +08:00
偏右
716c49c55f
Update work-with-us.md 2017-11-13 15:48:19 +08:00
afc163
a4faaad810 Merge branch 'master' into antd-3.0 2017-11-13 10:24:58 +08:00
Zach Guo
c1ce2cd82c docs: fix pattern/form invalid tag error (#8159) 2017-11-10 09:35:27 +08:00
afc163
856ecd4ae3 Merge branch 'master' into antd-3.0 2017-11-09 19:45:06 +08:00
Lyndon001
dd531b8428
Update work-with-us.md 2017-11-09 03:36:55 -06:00
afc163
9ffd545b24 fix order 2017-11-09 16:50:29 +08:00
afc163
23033cb9c1 Add work-with-us 2017-11-09 16:49:04 +08:00
afc163
b740d86bbf update feedback.md 2017-11-07 14:58:36 +08:00
afc163
2f0197599f Merge branch 'master' into antd-3.0 2017-11-06 21:19:44 +08:00
afc163
ac96bad478 Improve demo details and update snapshot 2017-11-06 21:14:40 +08:00
afc163
714b4ae06a Merge branch 'master' into antd-3.0 2017-11-06 10:35:41 +08:00
afc163
5fc64a8433 Add emoji-mart into recommandation 2017-11-03 15:07:42 +08:00
Andreas Cederström
a3610603bf Upgrade documentation of use with create-react-app (#8085) 
https://github.com/timarney/react-app-rewired have new compose protocol.

Check: https://github.com/timarney/react-app-rewired/tree/master/packages/react-app-rewire-less
 2017-11-01 18:53:20 +08:00
afc163
9583bb4c85 Add Ant Design Pro 2017-11-01 10:50:27 +08:00
afc163
f72ff080f2 Remove modao 2017-10-31 13:57:28 +08:00
afc163
39f0b67b0d update iconfont zip url 2017-10-28 17:47:16 +08:00
afc163
dcde9e7b60 Remove modao 2017-10-28 17:03:56 +08:00
Wei Zhu
7776cf62a7 Merge branch 'master' into antd-3.0 2017-10-25 10:25:02 +08:00
Eric Thomas
4a3602b536 docs:Fix spelling of difference (#7995) 2017-10-23 21:20:57 -05:00
henryv0
cad6be884c Updates Pattern docs (English) (#7902) 
* Makes grammatical and typo fixes to the React Docs.

* Fixes some spelling and grammar in Pattern docs.

* Fixes merge conflict. Updates Pattern docs.
 2017-10-17 15:01:21 +08:00
henryv0
2356333c54 Updates Pattern docs (English) (#7902) 
* Makes grammatical and typo fixes to the React Docs.

* Fixes some spelling and grammar in Pattern docs.

* Fixes merge conflict. Updates Pattern docs.
 2017-10-16 21:17:42 +08:00
afc163
00bfa49031 Merge branch 'master' into antd-3.0 2017-10-16 20:45:25 +08:00
Mohamed Seada
fa315e9f6d Add new locale (ar-EG: Arabic Egypt) #3 (#7888) 
* Add new locale (ar-EG: Arabic Egypt)

* resolve snapshot testing problem

* Add new locale (ar-EG: Arabic Egypt) to docs
 2017-10-14 14:30:54 +08:00
Mário Gonçalves
d4a5606b92 Fix description value (#7877) 
Double quote on description value was causing a rendering error
 2017-10-12 22:03:19 +08:00
afc163
94c6c910ff Merge branch 'master' into antd-3.0 2017-10-12 20:07:31 +08:00
偏右
b77cc6392e Improve upload status test case (#7869) 
* Add some companies

* test: generate snapshot in upload onChange

* change action

* upgrade travis node version

* fix ci
 2017-10-12 14:09:17 +08:00
afc163
43a2ae2905 update color spec doc 2017-10-10 20:23:21 +08:00
Benjy Cui
91fc781b6c chore: update docs and code style, ref: #7553#issuecomment-335009581 2017-10-10 10:04:03 +08:00
afc163
054444f619 Merge branch 'master' into antd-3.0 2017-10-07 15:34:19 +08:00
afc163
eb4659c409 typo 2017-10-06 16:08:56 +08:00
henryv0
ac33baf940 Makes grammatical and typo fixes to the React Docs. (#7819) 2017-10-06 16:08:03 +08:00
afc163
7a8a1a8ee3 Merge branch 'master' into antd-3.0 2017-09-30 21:31:29 +08:00
Wenchao Hu
084d4e6d49 修正错别字 (#7774) 2017-09-30 11:06:22 +08:00
Benjy Cui
829b5f87bf feat: make default locale to enUS (#7553) 
* feat: make default locale to enUS

* test: fix CI

* docs: update getting started
 2017-09-26 23:12:47 +08:00
afc163
7cc386df52 Merge branch 'master' into antd-3.0 2017-09-25 17:01:02 +08:00
Miaow
6c38ca62c6 update get started doc port (#7729) 2017-09-25 16:59:40 +08:00
afc163
6507aefd8e Merge branch 'master' into antd-3.0 2017-09-25 10:54:49 +08:00
afc163
29c262ab36 Remove iview and atui from antd implementations 2017-09-23 19:59:04 +08:00
afc163
412d7eebba Merge branch 'master' into antd-3.0 2017-09-22 18:37:08 +08:00
Marco Afonso
81435e2798 feat: add Portuguese locale (#7449) 
* Add pt_PT Locale

* Adding pt_PT Locale (fix comma)

* Adding pt_PT Locale to docs

* Add pt_PT locale to tests

* Update imports for rc-pagination and rc-calendar

* Add pt_PT Locale

* Adding pt_PT Locale (fix comma)

* Adding pt_PT Locale to docs

* Add pt_PT locale to tests

* Update imports for rc-pagination and rc-calendar

* Add pt_PT to tests
 2017-09-21 21:02:01 -05:00
afc163
7c8e55f0db docs: update i18n 2017-09-21 16:50:47 +08:00
afc163
d21e500fab Add some doc for global reset styles, #4331 2017-09-21 16:44:49 +08:00
afc163
fe7c85fece Merge branch 'master' into antd-3.0 2017-09-19 16:12:18 +08:00
afc163
5b6b36f5d6 Add map components to recommended list 2017-09-19 11:10:24 +08:00
afc163
823e07bc75 Merge branch 'master' into antd-3.0 2017-09-15 21:44:39 +08:00
afc163
f36bc02ac3 Add next.js demo link 2017-09-15 21:14:29 +08:00
afc163
b24483545c Merge branch 'master' into antd-3.0 2017-09-12 09:41:51 +08:00
Stefan Paunovic
0ac7ccaa8f feat: add is_IS locale (#7561) 2017-09-12 09:10:42 +08:00
afc163
9f484f9bf0 react-codemirror => react-codemirror2 2017-09-11 16:24:09 +08:00
chencheng (云谦)
e1efb82dcb docs: update Practical Projects for dva@2 (#7505) 2017-09-08 09:51:31 +08:00
偏右
81f16cb2e0 Merge pull request #7400 from ant-design/feature-2.13 
Feature 2.13
 2017-08-31 16:02:04 +08:00
afc163
d8aef384d3 fix doc 2017-08-31 15:50:46 +08:00
afc163
ef8beaffde Merge from master 2017-08-25 22:51:14 +08:00
afc163
d9ef06496d typo 2017-08-25 22:50:19 +08:00
偏右
e0699597ca Use create-react-app without ejecting (#7276) 2017-08-25 22:14:34 +08:00
Peter
275bdaef1a Update recommendation.zh-CN.md (#7310) 2017-08-25 12:04:13 +08:00
kdepp
c9b3a50519 doc: optimize compatibility part (#7322) 2017-08-25 10:41:37 +08:00
afc163
d4171badfd Merge from master 2017-08-19 12:40:40 +08:00
afc163
ff7ba0fb6f upgrade antd-tools and use next over beta, ant-design/antd-tools#57 2017-08-19 12:26:25 +08:00
afc163
d3ec477f8f Add NG-ZORRO links 2017-08-15 23:00:06 +08:00
Stefan Paunovic
7d8c7d72b7 feat: add sr_RS locale (Serbian) (#7201) 2017-08-15 09:24:30 +08:00
comerc
e92ef95f74 Add cra-ts-antd (#7195) 2017-08-14 09:44:25 +08:00
nikogu
7d49cc18a9 Merge branch 'master' into feature-2.13 2017-08-12 11:16:33 +08:00
afc163
9f75694c75 Fix link 2017-08-10 16:25:52 +08:00
Vemund Santi
b69a6886d7 Locale/nb-NO (#7122) 
* locale: Add Norwegian Bokmål locales to Ant Design

* Add Vemund Santi to authors.

* docs: add Norwegian to list of i18n language examples

* test: add tests for Norwegian Bokmål

* Update dependencies. Use locales from rc-pagination.
 2017-08-09 20:36:01 +08:00
afc163
a033e576fd doc: upgrade node version 2017-08-08 10:43:45 +08:00
afc163
53d279eb77 Add antizer 2017-08-07 22:14:48 +08:00
mkermani144
a9430e6748 Add fa_IR to i18n docs 2017-08-07 10:40:34 +08:00
afc163
2fdc4ec1e6 doc: update some words 2017-08-04 22:28:22 +08:00
afc163
6a17efcbf1 upgrade some devDeps and fix stylelint 2017-08-04 18:01:40 +08:00
Zach Guo
da8c82a6e4 translate patterns/list (#7056) 2017-08-04 17:42:14 +08:00
afc163
981573037a Add mobile components sketch template 2017-08-03 20:10:43 +08:00
afc163
e8fc686dcf site: add logo for stackoverflow and segmentfault 2017-07-31 21:50:49 +08:00
SHEN Lin
58ec298ded Translation pattern form (#6944) 
* 60% finish for translation of form

* finish form translation

* finish form translation and delete form.md

* modified translation

* modify title
 2017-07-29 14:17:45 +08:00
Zach Guo
9e6bc99816 Translate documentation for Navigation, both Pattern and Guideline (#6911) 2017-07-25 07:45:54 +08:00
Pierre Neter
0c0fc38be6 docs: just need one title like other documents (#6930) 2017-07-24 10:16:13 +08:00
偏右
547745271e Merge pull request #6932 from pierreneter/docs/spec/update 
Update Guidelines
 2017-07-24 09:37:59 +08:00
Pierre Neter
5c2b03dbfc Update Guidelines 
Signed-off-by: Pierre Neter <pierreneter@gmail.com>
 2017-07-24 03:15:07 +07:00
Pierre Neter
55d2511608 Remove help translate line 2017-07-24 01:40:21 +07:00
偏右
4667a0f6d6 Merge pull request #6839 from shenlin192/translation-specification-layout 
Translation of specification layout
 2017-07-17 00:43:24 +08:00
shenlin192@gmail.com
a7e37d614a remove translation of form 2017-07-16 18:35:05 +02:00
shenlin192@gmail.com
b0909774c0 capitialized sentences in list 2017-07-16 16:48:24 +02:00
shenlin192@gmail.com
feed80c8db created layout.zh-CN.md to replace the original file and removed Chinese words from the layout.en-US.md file 2017-07-15 13:35:46 +02:00
shenlin192@gmail.com
968c932778 finish layout translate 2017-07-14 11:22:00 +02:00
afc163
266e458a20 Add modao template links 2017-07-13 20:39:11 +08:00
shenlin192@gmail.com
1b7da8f9c0 finish layout translate 2017-07-13 14:30:50 +02:00
shenlin192@gmail.com
277facc8e3 translate 2017-07-12 17:15:44 +02:00
偏右
b653a2c055 Merge branch 'master' into feature-2.12 2017-07-07 19:41:37 +08:00
Sakol Assawasagool
bc7e0bad3e feat: add th_TH translation (#6721) 2017-07-04 17:54:36 +08:00
偏右
2659b35382 Merge pull request #6687 from Sowed/patch-2 
Update create-react-app.en-US.md
 2017-07-01 14:01:46 +08:00
iamcastelli
ce0fe06c8a Update create-react-app.en-US.md 
Fix grammar errors and punctuation
 2017-06-29 22:05:48 +03:00
iamcastelli
6bbbeb4a03 Update practical-project.en-US.md 
Fix some grammatical errors
 2017-06-29 21:33:17 +03:00
afc163
7151a4e720 update customize theme doc 2017-06-23 17:16:12 +08:00
afc163
5f9b000593 Add medium article link 2017-06-21 20:58:44 +08:00
Wei Zhu
5ede112633 Lowercase 2017-06-20 19:45:09 +08:00
Benjy Cui
fbe59e29a3 docs: update docs accoding to 7df0954 2017-06-15 17:50:33 +08:00
Pierre Neter
7df095414c docs: update i18n support 24 language (#6483) 
Signed-off-by: Pierre Neter <pierreneter@gmail.com>
 2017-06-15 17:34:38 +08:00
afc163
a644510677 change md file name 2017-06-15 13:41:18 +08:00
偏右
7e2828d4a4 Merge pull request #6370 from loganpowell/translation 
advanced search translation
 2017-06-15 13:40:01 +08:00
afc163
9cf1d72e3e remove if lte in IE11, it is not working 2017-06-14 20:14:08 +08:00
afc163
c90e0b3667 update recommendation links 2017-06-13 15:12:47 +08:00
afc163
28c7545030 update doc 2017-06-12 10:41:10 +08:00
Dennis Thompson
d5a4c93e7a Updating link for react-blocks 2017-06-10 17:58:19 -07:00
afc163
505cc23a74 Improve doc for create-react-app, close #6371 2017-06-06 13:40:51 +08:00
loganpowell
975b25f9d5 adding advanced search 2017-06-05 20:05:42 -04:00
loganpowell
f51d48fb33 testing translation 2017-06-05 17:25:56 -04:00
afc163
dd60cf8ca2 Add link 2017-06-01 14:12:26 +08:00
Leon
cf8aa16761 docs: change a reference link in docs (#6307) 
* 更改链接路径

原文路径不对，页面不存在，更改好可以～

* change reference link

add 'docs/' to make reference link right
 2017-06-01 09:24:21 +08:00
afc163
85d8137506 fix create-react-app doc 2017-05-28 17:03:34 +08:00
Wei Zhu
f5247aba61 docs: Add polyfill note 
close #6190
 2017-05-27 14:18:14 +08:00
afc163
be238c7887 upgrade create-react-app doc for newest version 2017-05-19 18:28:19 +08:00
afc163
7daf47b5b1 Add scaffold market link 2017-05-13 16:12:35 +08:00
afc163
9226746ba7 fix iconfont download url, close #6098 2017-05-11 13:30:38 +08:00
偏右
fc8189303d fix #6094 2017-05-11 10:34:40 +08:00
Arnaud Benhamdine
b288a23c88 Add import of LocaleProvider 2017-05-09 19:24:59 +02:00
Tyler
919cb22eb7 Use the prop-types package from npm instead of React.PropTypes (#6057) 
* Use the prop-types package from npm instead of React.PropTypes

* Remove using of PropTypes from React in docs and site
 2017-05-09 13:40:33 +08:00
afc163
5b22faacce fix broken link 2017-05-03 19:17:50 +08:00
Haroen Viaene
f8e86eae64 Update recommendation.en-US.md 
fix typo in table header

Recommanded => Recommended
 2017-04-30 18:10:07 +02:00
Darren Poon
11601bf982 Fix typos in introduce.en-US.md 2017-04-28 18:43:52 +08:00
Benjy Cui
5f80e50d31 Merge branch 'feature-2.10' 2017-04-28 09:41:34 +08:00
谷童
9ac0233ae8 Remove the duplicate words from customize-theme.zh-CN.md 2017-04-26 17:51:52 +08:00
OAwan
1903b75d38 Traditional Chinese locale provider added (#5665) 2017-04-22 22:52:01 +08:00
afc163
f7a68ee428 Improve design docs 2017-04-14 10:50:20 +08:00
afc163
20a5b699e4 update doc style 2017-04-13 14:06:43 +08:00
afc163
c5ab604f70 update introduce.md 2017-04-12 20:56:47 +08:00
afc163
bdf0f6212b fix design doc 2017-04-12 20:45:07 +08:00
ko
5fa0652af2 Minor spelling and grammar changes. 2017-04-12 00:38:45 -07:00
afc163
f2f3719748 Fix doc format 2017-04-12 14:54:52 +08:00
afc163
3ca3c178cc Add English gitter chat room 2017-04-11 18:13:58 +08:00
Kenaniah Cerny
b2db440457 Adds native English translation for icons spec 2017-04-08 18:28:07 -07:00
Wei Zhu
6dd3304976 Revert "Traditional Chinese locale provider added (#5665)" 
This reverts commit 65bac17e58.
 2017-04-09 03:37:49 +08:00
OAwan
65bac17e58 Traditional Chinese locale provider added (#5665) 2017-04-07 19:19:38 +08:00
Nishant Arora
0cd85da2b3 Fixed typo in docs/spec/feature(en_US) (#5655) 
* Fixed typo in docs/spec/feature(en_US)

expirerence changed to experience

* Added sentences removed by mistake.

In the previous typo fix commit, a few sentences at the end were removed. This commit fixes that.
 2017-04-07 00:05:39 +08:00
Kenaniah Cerny
73dd2c08bd Adds English translation for colors.md (#5602) 2017-04-05 17:08:02 +08:00
afc163
f230f61c23 Improve docs detail 2017-04-02 14:03:42 +08:00
afc163
70cd87d624 fix changelog 2017-04-01 21:12:03 +08:00
afc163
58b7662eb9 fix md 2017-04-01 18:00:28 +08:00
afc163
8049c75d47 Add react-lz-editor to recommendation list 2017-04-01 15:34:56 +08:00
afc163
95c0c591e7 remove docs/react/awesome-ant-design.md 2017-04-01 11:11:56 +08:00
afc163
b526083fa6 set monospaced font-family for number 2017-03-31 13:45:16 +08:00
afc163
4f89e54cb2 Merge from branch "master" 2017-03-28 15:58:41 +08:00
Yusuke Ito
b342dbefa2 Japanese locale (#5529) 
* add ja_JP translation

* fix Japanese locale

* fix i18n docs

* update rc-pagination version

* add locale test for ja_JP
 2017-03-28 15:11:33 +08:00
Peter Berg
aa99586f9a Cleans up introduce.en-Us.md (#5517) 
Fixes some small grammatical errors and makes some of the english sound more natural.
 2017-03-28 00:25:29 +08:00
afc163
cdeeb776e0 update docs 2017-03-27 10:09:38 +08:00
afc163
cad9edc06c fix outdated links, close #5485 2017-03-27 10:09:38 +08:00
Benjy Cui
1669735b66 docs: recommend react-document-title 2017-03-27 10:09:38 +08:00
afc163
d26554d1e9 update doc 2017-03-27 10:09:06 +08:00
afc163
218a516000 update doc 2017-03-27 10:09:06 +08:00
afc163
459c3c94f9 update recommendation list 2017-03-27 10:09:06 +08:00
afc163
fa590e3506 update customize docs 2017-03-27 10:09:06 +08:00
afc163
b25a4671ee update customize docs 2017-03-27 10:09:06 +08:00
Conway Anderson
10ad3a0fbd Clarity update for customize-theme.en-US.md (#5411) 
First attempt at making the docs for the recommended form of theme customization more specific. The goal is to make this section more accessible to beginners.
 2017-03-27 10:09:06 +08:00
afc163
3afac92fea update docs 2017-03-24 20:23:21 +08:00
afc163
6f1dd16721 fix outdated links, close #5485 2017-03-24 16:34:17 +08:00
Benjy Cui
4a9ae162c6 docs: recommend react-document-title 2017-03-24 10:11:24 +08:00
afc163
50e5cd3459 update doc 2017-03-23 15:25:28 +08:00
afc163
7471a59df6 update doc 2017-03-23 15:11:35 +08:00
afc163
610452ea8d update recommendation list 2017-03-22 11:17:37 +08:00
afc163
d5be2581c5 update customize docs 2017-03-21 15:59:31 +08:00
afc163
351737a1aa update customize docs 2017-03-21 15:55:14 +08:00
Conway Anderson
e5fff4fad6 Clarity update for customize-theme.en-US.md (#5411) 
First attempt at making the docs for the recommended form of theme customization more specific. The goal is to make this section more accessible to beginners.
 2017-03-21 15:39:37 +08:00
偏右
c44d3e0a1d Update colors.md 2017-03-19 19:02:49 +08:00
偏右
6e7d46fbda Update colors.md 2017-03-19 19:01:46 +08:00
偏右
846b844bfd Update colors.md 2017-03-19 19:00:48 +08:00
afc163
9a72f94027 update documentation of icon 2017-03-19 14:12:58 +08:00
afc163
3b4a51d1ef Refactor color.md 2017-03-17 20:33:47 +08:00
afc163
ebeda75c36 Add color palette generator tool 2017-03-17 20:14:11 +08:00
偏右
84e3aa2a37 New design docs (#5370) 
* refactor design documentations

* update color document

* Add icon

* Fix images in documentation

* fix some documentation style

* Finish icon doc

* Add copywriting doc

* Add layout.md and navigation.md

* Add more docs

* Fix error color

* improve markdown doc width

* update some details

* fix doc detail

* Add motion.md
 2017-03-17 18:56:37 +08:00
afc163
061e297b66 update download image url 2017-03-17 18:45:22 +08:00
zuiidea
18da0deb5e add demo:antd-admin (#5326) 2017-03-16 23:38:22 +08:00
zuiidea
cbbb2e0c61 add demo:antd-admin (#5327) 2017-03-16 23:36:49 +08:00
afc163
30ec172924 update doc 2017-03-15 20:38:57 +08:00
afc163
a5ce520cc4 site: improve recommendation page style 2017-03-14 20:08:59 +08:00
afc163
9a8f1d7819 Add some Third-Party Libraries 2017-03-14 19:52:00 +08:00
英布
fa938ad900 Update introduce.zh-CN.md (#5286) 2017-03-14 11:08:37 +08:00
afc163
d124f88930 update sketch template link 2017-03-13 18:14:06 +08:00
afc163
4382d4ea23 update readme 2017-03-13 15:55:21 +08:00
afc163
5665444349 update readme 2017-03-13 15:49:15 +08:00
afc163
3002ff33c4 update font docs 2017-03-13 11:42:11 +08:00
afc163
d0353eeb1b tweak docs style 2017-03-13 11:13:12 +08:00
afc163
bad7e85b1f Add note about create-react-app webpack.config.prod.js, close #5273 2017-03-13 10:54:40 +08:00
afc163
b29bec002e update some documentation 2017-03-12 15:20:54 +08:00
afc163
2ebd983aad update docs 2017-03-10 20:34:30 +08:00
afc163
b3982ad210 site: improve copy icon and color 2017-03-10 18:04:14 +08:00
afc163
f2f786d66d docs: add boilerplate samples 2017-03-10 16:37:39 +08:00
Bill Sheikh
52b3ebdf13 Add ability to copy color on palette click (#5247) 2017-03-10 14:56:11 +08:00
afc163
941782f7ec Add iconfont shake and android-o 2017-03-09 14:33:58 +08:00
afc163
a2b1632817 update doc title 2017-03-08 13:44:24 +08:00
afc163
a84d85e02b Add docs, close #5197 2017-03-07 16:11:37 +08:00
afc163
e15d12ffdf docs: update introduce.md 2017-03-03 15:08:31 +08:00
afc163
5ecdc88640 docs: update introduce.md 2017-03-03 13:48:22 +08:00
afc163
63c6977829 docs: update introduce 2017-03-02 11:24:44 +08:00
afc163
02773874a8 update babel-plugin-import document 2017-03-02 00:34:38 +08:00
afc163
7174337e53 fix typo 2017-03-01 18:50:45 +08:00
afc163
1fc211629d docs: update recommended list 2017-03-01 14:42:08 +08:00
afc163
16a7c389e8 docs: Add some links for rich text editor to recommended list 2017-03-01 14:36:05 +08:00
afc163
4875908807 update 2017-02-28 00:43:15 +08:00
afc163
6d90f1f154 docs: add translation and clean up old design doc 2017-02-27 21:20:49 +08:00
afc163
4823ce4d08 site: update design documentation 2017-02-27 18:04:35 +08:00
afc163
0f46eed370 fix lint 2017-02-23 11:45:48 +08:00
afc163
52bfb8069a site: fix link 2017-02-23 00:36:02 +08:00
afc163
32150a15a4 update document 2017-02-22 14:04:40 +08:00
afc163
6b4ca79359 update documentation 2017-02-20 20:29:30 +08:00
afc163
ae67f5cc20 update doc 2017-02-19 18:20:56 +08:00
Chikara Chan
5ff8723a9f docs: fix import style error due to duplicated identifier (#4917) 
* fix render unuse className when type is undefined

* docs: fix import style error due to duplicated identifier
 2017-02-17 11:11:42 +08:00
afc163
6002a3351e update docs 2017-02-16 16:26:53 +08:00
afc163
658922e796 Update link 2017-02-15 14:41:16 +08:00
Benjy Cui
200b88246f docs: update docs format 2017-02-13 10:55:53 +08:00
Benjy Cui
5d2513ce91 docs: update img 2017-02-10 13:55:17 +08:00
Benjy Cui
251930f183 docs: fix some link 2017-02-09 17:55:26 +08:00
afc163
df2982aacf Fix spec/layout demo, close #4816 2017-02-09 16:22:03 +08:00
afc163
10199e5d96 docs: update customize theme doc 
ref: dvajs/dva#562 dvajs/dva#575
 2017-02-09 14:44:36 +08:00
afc163
33c171c04b docs: update for compatibility 2017-02-08 11:33:41 +08:00
afc163
de185ddc19 docs: update text 2017-02-07 19:56:08 +08:00
afc163
1e55c145cc docs: update babel option 2017-02-07 17:20:59 +08:00
afc163
10d6486b4d docs: fix markdown link 2017-02-07 00:40:37 +08:00
afc163
d79a08c468 update links 2017-01-31 21:12:52 +08:00
Marius Ileana
882ecc370a Review of docs/spec/layout/demo/ceiling.md (#4709) 
Small review corrections.
 2017-01-25 21:11:02 +08:00
Marius Ileana
d2e862d3af Update aside.md (#4707) 
Small review corrections.
 2017-01-25 21:10:51 +08:00
Marius Ileana
a963fd1c60 Review of docs/spec/layout/demo/top.md (#4710) 
Small review corrections.
 2017-01-25 21:10:42 +08:00
afc163
a7517c7000 docs: update react-fa link 2017-01-25 12:00:38 +08:00
Marius Ileana
def370ee33 Update aside-collapse.md (#4708) 
Small corrections as part of my review.
 2017-01-25 11:12:04 +08:00
Gray Choi
bde7d1c624 Translate layout specification (#4542) 
* create english index file

* tanslated the index

* tanslated aside.md

* adjust code format

* translated aside-collapse.md

* translated ceiling.md

* translated top.md

* translated top-aside.md
 2017-01-23 11:08:46 +08:00
afc163
04a94a691e site: update sider menu order 2017-01-22 19:16:54 +08:00
afc163
0b2342f9c2 update README.md 2017-01-22 01:19:04 +08:00
afc163
2292a8e6c5 update README.md 2017-01-22 01:15:29 +08:00
Benjy Cui
3e17551b7e site: improve build speed 2017-01-19 15:22:53 +08:00
Richard D. Worth
c427c3c4b9 lightweight.en-US.md typo 'while' -> 'whole' (#4643) 2017-01-19 09:00:56 +08:00
Richard D. Worth
e7f329a168 invitation.en-US.md change "" to &quot; (#4644) 2017-01-19 09:00:31 +08:00
afc163
95bc803dc3 update doc 2017-01-16 11:35:44 +08:00
chencheng (云谦)
82581f2217 fix(docs): port is not correct, Close #4607 (#4612) 2017-01-16 10:01:42 +08:00
afc163
8d91206da1 Add react-fa 2017-01-15 15:14:54 +08:00
afc163
fc32c751ca update doc 2017-01-14 22:49:40 +08:00
afc163
d013952398 remove unused doc 2017-01-12 21:51:40 +08:00
Benjy Cui
ff67c6eee6 docs: add documentation of third-party and awesomeness (#4559) 
* docs: add documentation of third-party and awesomeness

* docs: merge install.md into introduce.md

* docs: update recommendation components list
 2017-01-12 17:57:04 +08:00
VTHINKXIE
b305a9c7e7 update link of ant.design of angular 2 (#4570) 2017-01-11 19:21:37 +08:00
afc163
69d6a23645 site: fix image 2017-01-09 21:14:22 +08:00
afc163
765ae70cf5 site: fix image 2017-01-09 21:08:19 +08:00
afc163
d0727df147 update doc about Import on Demand 2017-01-09 21:03:12 +08:00
afc163
361169a3e4 use yarn over npm in create-react-app doc 2017-01-09 13:50:49 +08:00
afc163
de0805899f update links 2017-01-08 20:06:51 +08:00
afc163
cfcf72e70e update doc 2017-01-04 15:25:53 +08:00
afc163
6750c0b82b Make color value can be selectable 2017-01-04 15:13:55 +08:00
Benjy Cui
9d92066d1f chore: update data-picker detail, ref: #4415 2017-01-04 10:48:40 +08:00
chencheng (云谦)
0230385e95 docs: update practical-projects (#4385) 2017-01-04 10:11:53 +08:00
偏右
8f3dc0f16e Update introduce.en-US.md 2017-01-03 14:21:42 +08:00
afc163
372a44a92a update doc about startsWith 2017-01-02 23:45:20 +08:00
偏右
d811ebee5c New color system (#4426) 
* Add new color patterns algorithm

* Add color palettes

* update other colors

* fix gray color

* update more tint/shade to colorPalette

* new font color

* Update doc for new color system

* improve doc style
 2017-01-01 22:20:06 +08:00
afc163
959fc6b2e3 update docs 2016-12-30 14:13:43 +08:00
afc163
967b9a77a9 update doc 2016-12-28 15:50:59 +08:00
afc163
8852dfd767 update doc titles 2016-12-28 15:45:37 +08:00
afc163
047476efaf update customize-theme doc 2016-12-28 00:23:32 +08:00
afc163
22a0604ed5 update doc for babelrc 2016-12-27 21:07:16 +08:00
Babajide Fowotade
8c0692f5e7 Fix babel dir path to modify in create-react-app docs (#4362) 2016-12-26 11:15:36 +08:00
afc163
cee6fa49e8 Improve layout spec demo style 2016-12-23 17:58:37 +08:00
chencheng (云谦)
7a67f5ce0f docs: update pratical-projects for dva-cli@0.7 (#4322) 2016-12-22 14:25:01 +08:00
偏右
ee5a8beca1 Add doc about using antd with create-react-app (#4294) 
* Add doc about using antd with create-react-app, close #2526

* translate to english

* update comment

* update
 2016-12-22 14:24:50 +08:00
afc163
6d142b11eb update install documentation 2016-12-21 19:34:20 +08:00
afc163
5043a165f5 update english docs 2016-12-16 22:10:47 +08:00
afc163
f1c828c71d update links 2016-12-12 20:44:40 +08:00
弘树@阿里
e280b1ac4b docs: Update introduce.zh-CN.md (#4193) 
* Update introduce.zh-CN.md

save dependency for `antd` using `npm i`

* Update introduce.zh-CN.md

Modify `-S` to `--save`

* Update introduce.en-US.md

add `--save` for `npm install`
 2016-12-11 18:28:46 +08:00
Babajide Fowotade
19b04422ef docs: fix broken changelog link on introduce page (#4177) 2016-12-08 09:00:54 +08:00
Joe Hsu
3fe99ea973 docs: double negative (#4161) 2016-12-07 09:20:09 +08:00
Babajide Fowotade
1a4d9159b3 docs: Fix typo on introduce.md (#4149) 2016-12-06 16:36:55 +08:00
Benjy Cui
883066820a docs: add translation for spec 2016-12-06 11:48:52 +08:00
Benjy Cui
59f0e6254b docs: add i18n link, ref: #3895 2016-12-06 10:19:51 +08:00
afc163
392805e0e5 update getting-started 2016-12-05 12:02:30 +08:00
afc163
bf8b1bf6a9 fix docs 2016-12-04 17:37:26 +08:00
偏右
304ccf1ea5 Changelog 2.5.1 (#4119) 
* changelog for 2.5.1

* Add changelog for 2.x

* remove upgrade-note

* update changelog
 2016-12-04 16:56:20 +08:00
afc163
ab37e056f1 improve English expression 2016-12-04 00:35:47 +08:00
afc163
c0e9f8c52e fix link 2016-12-02 17:00:40 +08:00
ChrisFan
3df84e33c6 docs: update 开发脚手架 link 2016-12-02 15:46:42 +08:00
jiang
adad537532 Update motion.md (#4109) 2016-12-02 13:29:14 +08:00
lehug
b4d4af64a1 docs: “決定”更改为“决定” (#4073) 
修正错别字，“決定”更改为“决定”。
 2016-11-30 15:18:23 +08:00
Benjy Cui
e0e700cddd docs: improve detail of demo for layout, close: #4066 2016-11-30 10:54:42 +08:00
ashishg-qburst
5db5fed7b9 docs: fix typos and grammar on spec/introduce (#4062) 2016-11-29 23:04:39 +08:00
Dorian
7325cdb37a docs: Fixes link typo in docs (#4036) 2016-11-28 21:00:26 +08:00
Wei Zhu
9c2b197163 docs: fix principle link [ci skip] 2016-11-28 14:32:36 +08:00
afc163
2aeccd4955 update doc link 2016-11-26 16:07:01 +08:00
Marius Ileana
57fa4cbb52 Small typos and review 2016-11-23 22:13:21 +02:00
afc163
540d51fe8d update spec/introduce.md 2016-11-23 21:09:42 +08:00
偏右
c8caf3a08c Merge pull request #3953 from nimojs/master 
<script src="...> => <script src="...">
 2016-11-22 19:39:24 +08:00
Nimo
e5f289f1a3 es6-shim for ie10/11 2016-11-22 19:36:11 +08:00
Nimo
2013202386 <script src="...> => <script src="..."> 
script src 缺少 "
 2016-11-22 17:36:21 +08:00
afc163
0613a1b065 update doc 2016-11-22 14:47:56 +08:00
afc163
b51b18acd6 fix image background 2016-11-21 12:32:40 +08:00
afc163
485e22f38d Add sketch template file in resource page 2016-11-20 19:52:39 +08:00
afc163
5982e94456 Add screenshot 2016-11-18 16:16:34 +08:00
afc163
7af7e8382d Add customize-theme.md 2016-11-18 15:38:36 +08:00
afc163
5b77cf7452 add doc 2016-11-18 11:58:22 +08:00
Bruce Mitchener
9fd1f88441 Site typo fixes. 2016-11-16 20:34:28 +07:00
afc163
92d77e4c5d Add internal link 2016-11-15 19:16:23 +08:00
parlop
7526d7be08 fix typo toturial to tutorial 
fix typo toturial to tutorial
 2016-11-14 09:12:05 -05:00
afc163
169e6cf99c update doc 2016-11-14 14:16:12 +08:00
afc163
a1fe873bd9 update links 2016-11-14 11:08:26 +08:00
afc163
9cc05c530b Add iView link, iview/iview#55 2016-11-10 11:09:58 +08:00
afc163
a7b384112e es6-shim for ie10/11 2016-11-08 18:03:22 +08:00
afc163
52e649a9fb Merge branch 'master' of github.com:ant-design/ant-design 2016-11-07 14:02:16 +08:00
afc163
6d91290f95 remove vue-antd 2016-11-07 14:02:07 +08:00
蔡伦
1e95ad9bad fix typo (#3744) 2016-11-07 11:02:53 +08:00
吕立青
5cebea6b47 Update practical-projects.zh-CN.md 
Just fixed small typo.
 2016-11-05 15:31:43 +08:00
afc163
1e1a3e755c update document 2016-10-29 15:49:56 +08:00
偏右
b240494dd5 typo 2016-10-27 21:20:28 +08:00
afc163
831533d139 update doc 2016-10-22 17:29:00 +08:00
Benjy Cui
a9fff1be5b docs: update links 2016-10-20 14:49:51 +08:00
Benjy Cui
f747f10676 docs: update link and add tags 2016-10-19 14:04:46 +08:00
Benjy Cui
f8b46ad06a docs: update recommended way to ask questions, close: #2320 2016-10-19 12:19:30 +08:00
afc163
55c2223366 update form docs, #3473 2016-10-18 21:12:52 +08:00
afc163
c14030869a Improve doc about compatibility 2016-10-15 17:26:39 +08:00
kvetoslavnovak
f3cbbc02e9 Site introduction page in line with GitHub one (#3404) 2016-10-13 12:27:29 +08:00
afc163
81410f5b0c update doc links 2016-10-07 21:10:05 +08:00
afc163
847e40eac0 Adjust site layout 2016-10-07 14:33:08 +08:00
afc163
22b7ab84fc http => https 2016-09-29 14:32:15 +08:00
Shawn Sit
122e223c0b docs: translate books name and links (#3202) 2016-09-29 10:34:20 +08:00
afc163
178311a393 IE8 => IE9 2016-09-28 00:07:31 +08:00
Benjy Cui
c819fe280e docs: update links 2016-09-26 16:52:06 +08:00
afc163
eb104fe123 update implementation links 2016-09-26 13:47:35 +08:00
afc163
b2c91fb521 update implementation links 2016-09-26 13:42:18 +08:00
Benjy Cui
b43d40d47b docs: translate category for specification 2016-09-26 11:08:27 +08:00
Benjy Cui
2b90ab8464 docs: fix typo, ref: #3146 2016-09-23 15:35:17 +08:00
Benjy Cui
59cac0721d docs: translate titles of pattern 2016-09-21 14:03:22 +08:00
Benjy Cui
3f67fd3f9f docs: update docs details 2016-09-21 11:28:38 +08:00
chencheng (云谦)
9d9185127c docs: rename babel-plugin-antd to babel-plugin-import (#3089) 2016-09-20 17:17:49 +08:00
sorrycc
e8fdcc9b8a fix(docs): typo 2016-09-19 21:53:00 +08:00
sorrycc
681576d2c4 docs: upgrade Getting Started with antd-init@2 2016-09-18 17:47:58 +08:00
sorrycc
e6c406a4b7 docs: add Practical Projects 2016-09-18 17:39:11 +08:00
afc163
bb325b5982 update iconfont download url 2016-09-18 14:15:53 +08:00
afc163
98d4145531 update translation 2016-09-18 14:04:21 +08:00
Shawn Sit
7d9ac4219a docs: Translation resource (#3032) 
* translated reference

* translated docs of resources

* fixs: misspell

* resources doc enhancement
 2016-09-18 09:28:28 +08:00
afc163
9e5061acdc Merge branch "1.x-stable" 2016-09-15 01:25:28 +08:00
Marius Ileana
a94ccc4421 docs: Translation (and review) of docs/practice section (#2998) 
* translation (and review) of docs/practice secion

* included the corrections of benjycui and afc

comments/corrections included.
 2016-09-12 15:44:42 +08:00
Benjy Cui
43d75abb3a docs: update docs of spec 2016-09-12 10:37:17 +08:00
Marius Ileana
00ac554e41 docs/react/install.en-US.md - small typo update (#3004) 2016-09-11 21:23:57 +08:00
Benjy Cui
5361dd3687 site: fix colors.md 2016-09-11 15:07:05 +08:00
偏右
4be7fb3b98 Update introduce.en-US.md 2016-09-10 11:01:59 +08:00
npmcdn-to-unpkg-bot
e645e3a8fa Replace npmcdn.com with unpkg.com (#2987) 2016-09-09 21:07:05 +08:00
afc163
bab669d17d Merge branch "1.x-stable" 2016-09-08 15:17:39 +08:00
afc163
ac97851b84 update axure library link 2016-09-08 14:55:58 +08:00
Andrew Murray
0d00c5fb6c docs: Fixed typos (#2921) 2016-09-01 18:12:12 +08:00
Benjy Cui
96543d5360 docs: update cdn, close: #2896 2016-08-31 16:03:35 +08:00
Benjy Cui
e6280a7ea6 Merge branch '1.x-stable' 2016-08-22 17:05:37 +08:00
afc163
2dae3363c2 update download.zh-CN.md 2016-08-20 17:52:36 +08:00
afc163
95846a767c update axure library file, close #2714 2016-08-17 16:28:50 +08:00
afc163
24d2973c32 Merge branch "1.x-stable" 2016-08-16 17:54:59 +08:00
afc163
da6b65f7f0 Merge 1.x-stable 2016-08-12 14:47:01 +08:00
afc163
35d3c6a86c update links 2016-08-11 16:45:15 +08:00
afc163
b200f8a2d8 Merge 1.x-stable 2016-08-08 14:12:02 +08:00
Benjy Cui
e051d03623 docs: translation of getting-started and introduce (#2627) 2016-08-08 10:32:22 +08:00
afc163
f869943c5c fix link 2016-08-04 17:59:07 +08:00
afc163
0d84468925 Add link 2016-08-04 17:06:22 +08:00
afc163
bb68245b7f Merge 1.x-stable 2016-08-04 14:06:09 +08:00
afc163
a8d33b9fb2 update iconfont download url 2016-08-04 11:26:02 +08:00
Benjy Cui
7f1222f271 docs: translate specification (#2377) 2016-07-31 10:17:07 +08:00
afc163
71d74c30c1 Merge 1.x-stable 2016-07-29 13:57:54 +08:00
afc163
9f5d294c83 Add mobile link 2016-07-29 13:52:05 +08:00
afc163
7952215a48 fix hash scroll 2016-07-26 18:35:38 +08:00
afc163
32ab285886 Merge branch '1.x-stable' 2016-07-24 13:49:42 +08:00
afc163
011e9f8ce0 fix site style 2016-07-23 18:15:06 +08:00
afc163
a72d9ec381 Merge 2016-07-21 18:10:13 +08:00
afc163
db00e94b40 fix links 2016-07-21 18:07:49 +08:00
afc163
42d34a5db3 Merge branch '1.x-stable' 2016-07-21 14:34:37 +08:00
afc163
6e673b8b44 fix spec color 2016-07-19 14:40:56 +08:00
afc163
872fc824c1 fix typo 2016-07-18 13:22:07 +08:00
afc163
3a4f464d0f update docs 2016-07-17 18:37:44 +08:00
afc163
4ff4e57bd0 fix warning 2016-07-16 15:02:02 +08:00
afc163
f5e98a617a fix duplicate document 2016-07-05 15:51:56 +08:00
afc163
1e1fde8753 Fix spec/font.md 2016-06-28 21:09:49 +08:00
afc163
37cf2a3d5e update docs 2016-06-24 13:05:16 +08:00
afc163
5ea41467a0 Add boilerplates to doc, close #2109 2016-06-23 12:54:37 +08:00
Wei Zhu
6a9cd2ff18 docs: use github new issue link directly (#2119) 2016-06-21 13:09:15 +08:00
afc163
252fa8446e update doc 2016-06-18 16:07:41 +08:00
afc163
5544856c56 update doc 2016-06-18 16:05:14 +08:00
afc163
b27f0eb68f Remove es*-shims (benjycui/bisheng#23) 2016-06-16 17:38:14 +08:00
afc163
024cccdf97 update docs 2016-06-16 11:54:41 +08:00
afc163
1ac665e61d fix typo 2016-06-16 11:11:35 +08:00
zhaocai
a7ec4259a2 fix 404 in install.zh-CN.md (#2037) 
* fix changelog link

* found 404,change the url
 2016-06-14 17:10:39 +08:00
afc163
a87ce1b090 fix design docs style 2016-06-14 11:34:48 +08:00
lizhaocai
b6d7645b26 fix changelog link (#1981) 2016-06-06 15:17:02 +08:00
RaoHai
ff31a5b555 Revert "Revert "refactor with bisheng"" 
This reverts commit 7a07b128d1.
 2016-05-27 11:48:08 +08:00
RaoHai
7a07b128d1 Revert "refactor with bisheng" 2016-05-27 11:03:49 +08:00
Benjy Cui
4afb1cc6dd site: update 2016-05-27 09:44:07 +08:00
Benjy Cui
0d0b6b0a32 site: update 2016-05-27 09:44:07 +08:00
afc163
b2f6407560 update getting started doc 2016-05-26 12:16:14 +08:00
afc163
f34854d667 update getting-started 2016-05-24 14:57:53 +08:00
ddcat1115
102ae62f45 fix #1643 (#1785) 2016-05-20 14:19:09 +08:00
afc163
c9e8423c7e Fix site style, close #1789 2016-05-20 13:23:51 +08:00
afc163
ab958f3325 improve collaspe layout style 2016-05-18 11:43:40 +08:00
Benjy Cui
2964393e5a site: fix intl bug 2016-05-17 11:53:10 +08:00
Benjy Cui
8971074b3d site: add i18n for common md file 2016-05-16 15:41:55 +08:00
afc163
c277637af5 fix some menu detail 2016-05-16 14:35:24 +08:00
ddcat1115
bc7b5aada2 fix1643 2016-05-16 10:58:34 +08:00
Wei Zhu
4bb1481acc docs: s/form/from/ fix #1703 (#1704) 2016-05-16 09:46:35 +08:00
Wei Zhu
027e9eed0b fix broken link (#1705) 
docs: fix broken link
 2016-05-16 09:45:09 +08:00
afc163
e3c0a059c8 trim whitespace 2016-05-16 00:12:50 +08:00
afc163
7885425fe2 fix #1702 cause antd-init change its script command 2016-05-16 00:11:45 +08:00
afc163
80c7583562 update input-number disabled style 2016-05-15 14:20:38 +08:00
afc163
ec93665a0a update docs 2016-05-11 17:50:51 +08:00
afc163
d4c5579bac update docs for babel-plugin-antd 2016-05-11 16:21:52 +08:00
afc163
5f253fd913 update docs 2016-05-11 16:08:28 +08:00
afc163
5077873ae0 fix codepen links 2016-05-11 02:02:23 +08:00
afc163
001cf94e45 Fix some detail style 2016-05-10 15:44:24 +08:00
afc163
7e083ddaf0 improve site style 2016-05-10 14:44:23 +08:00
afc163
c1c8a04875 Add 1.0.0 Changelog (#1614) 
* Add 1.0.0 Changelog (#1574)

* Add github links

* update changelog

* upgrade changelog

* fix links
 2016-05-10 14:22:05 +08:00
afc163
9b4a159d09 Merge branch 'master' into develop-1.0.0 2016-04-29 23:51:30 +08:00
afc163
e111e52231 fix link, close #1554 2016-04-29 23:44:33 +08:00
afc163
205e76aa73 Add entry less file and update document (#1534) 
* Add entry less file and update document

* fix pre-publish script
 2016-04-28 15:54:18 +08:00
Benjy Cui
5cbc8fc814 docs: update links 2016-04-27 17:03:17 +08:00
yiminghe
ace39a464e optimize site 2016-04-21 20:06:35 +08:00
afc163
902b196687 change doc order 2016-04-18 15:19:37 +08:00
afc163
ca178b1ede improve install doc, ref #1338 2016-04-13 15:40:34 +08:00
afc163
22591af2f6 update doc 2016-04-12 19:18:49 +08:00
afc163
5ad74ce330 update codepen using npmcdn 
close #1338
 2016-04-12 17:24:59 +08:00
afc163
ddd619803a some site detail 2016-04-09 14:46:20 +08:00
Benjy Cui
421ee0ddf9 site: remove warnings 2016-04-07 15:36:55 +08:00
Benjy Cui
bcba08a124 docs: update docs format 2016-04-07 15:36:55 +08:00
Benjy Cui
c5d4a40ab1 docs: update install.md 2016-04-07 14:12:52 +08:00
Benjy Cui
749bf18e8d docs: update install.md 2016-04-07 09:28:25 +08:00
afc163
68fae5acdf Merge branch 'master' into develop-1.0.0 2016-04-05 17:11:26 +08:00
afc163
c80cfd5081 update docs 2016-04-04 15:21:33 +08:00
afc163
b340cd9c31 Merge branch 'master' into develop-1.0.0 2016-04-03 16:33:12 +08:00
afc163
de88d8d26c update install.md for standalone build 
ref: #1262 #1036 #1318 #495
 2016-04-03 16:22:51 +08:00
devqin
e2dfe5cfd3 Update getting-started.md 
http://ant-tool.github.io/webpack-config.htm -> http://ant-tool.github.io/webpack-config.html
 2016-04-01 15:10:19 +08:00
devqin
4fdaf11e8e Update getting-started.md 
http://ant-tool.github.io/webpack-config.htm -> http://ant-tool.github.io/webpack-config.html
 2016-04-01 14:41:39 +08:00
Benjy Cui
df3ba36720 docs: remove useless newline in documentation 2016-04-01 10:08:19 +08:00
Benjy Cui
d5a6932c15 docs: update documentation format 2016-03-31 14:17:09 +08:00
Benjy Cui
03d09b66e8 docs: update demo format 2016-03-31 09:40:55 +08:00
afc163
15468aea57 update pages about motion 2016-03-30 14:32:41 +08:00
afc163
5ba39859d6 Merge from master 2016-03-30 11:45:07 +08:00
afc163
88531eeab2 update motion.md 2016-03-30 11:33:41 +08:00
afc163
df1252cba1 Merge branch 'master' into develop-1.0.0 2016-03-25 16:01:12 +08:00
afc163
c4df6b940c update docs 2016-03-25 15:42:08 +08:00
afc163
b0827e2d8f Add TimePicker locale change doc, close #1270 2016-03-25 15:41:05 +08:00
Benjy Cui
f723d6ca51 refactor: remove some hard code 2016-03-23 10:43:43 +08:00
afc163
fb6c6abbc7 Merge master 2016-03-22 19:31:55 +08:00
afc163
1e2576aeba Add antd-ember 2016-03-22 00:28:51 +08:00
afc163
54a878873c fix whitespace 2016-03-22 00:26:33 +08:00
afc163
8fa7f9aec4 update docs 2016-03-22 00:22:35 +08:00
Benjy Cui
58ff5fded4 site: fix warnings 2016-03-21 10:44:31 +08:00
afc163
77783d8c9b rollback for es3ify, #858 2016-03-19 13:54:38 +08:00
afc163
9a937100e8 fix(docs): close #1230 2016-03-19 01:54:46 +08:00
afc163
adb64f1fe4 update resource files 2016-03-18 15:17:34 +08:00
afc163
1b5bff51dd update resource files 2016-03-18 15:15:31 +08:00
Benjy Cui
1f7a30c99c Merge branch 'master' of github.com:ant-design/ant-design into spa-new-design-language 2016-03-18 11:12:51 +08:00
Benjy Cui
1a1adc4fe9 site: support video in Markdown 2016-03-16 17:46:35 +08:00
afc163
272d1a1136 update docs 2016-03-16 11:23:16 +08:00
Benjy Cui
55b163d62e site: update site style 2016-03-15 17:40:31 +08:00
afc163
21e8439d41 fix typo 2016-03-15 14:14:57 +08:00
Benjy Cui
122886dea1 site: solve some conflicts with new-deisgn-language 2016-03-15 11:19:57 +08:00
afc163
b798ee7520 update feature page style in mobile screen 2016-03-15 10:57:53 +08:00
Benjy Cui
ebab622add Merge branch 'master' of github.com:ant-design/ant-design into develop-1.0.0 2016-03-15 09:47:55 +08:00
hi-caicai
d03d42bf30 update docs 2016-03-14 17:38:01 +08:00
hi-caicai
1e06f1f8b7 update docs 2016-03-14 17:18:49 +08:00
hi-caicai
bc644e54cb update docs 2016-03-14 17:14:29 +08:00
afc163
4d7d49c3d0 update pictures 2016-03-14 16:31:42 +08:00
afc163
695a04278e Merge branch 'master' into new-design-language 2016-03-14 16:18:08 +08:00
afc163
9665daa192 move toc under meta description 2016-03-14 16:18:06 +08:00
afc163
ffe729a77b update docs 2016-03-14 15:01:00 +08:00
Bruce Mitchener
5b76337bdc Minor English grammar improvements. 2016-03-14 11:45:06 +07:00
hi-caicai
b4060f40a9 update reaction.md 2016-03-14 11:31:14 +08:00
hi-caicai
1e59f48691 merge conflict ant update spec docs 2016-03-14 11:29:09 +08:00
afc163
996eca7eb9 update style 2016-03-13 22:28:42 +08:00
afc163
fd1856dac3 update design docs 2016-03-12 15:05:29 +08:00
afc163
acec3e68f1 update design docs 2016-03-12 14:53:57 +08:00
afc163
833eebccb7 update docs 2016-03-11 17:48:46 +08:00
hi-caicai
b5ace6ec1d update 2016-03-11 17:37:27 +08:00
hi-caicai
59fb1af79a update docs 2016-03-11 16:11:46 +08:00
afc163
50a710a674 Merge branch 'master' into new-design-language 2016-03-11 16:06:52 +08:00
afc163
9c713e5875 Merge branch 'new-design-language' of github.com:ant-design/ant-design into new-design-language 2016-03-11 16:03:06 +08:00
afc163
014b66cc37 fix docs 2016-03-11 16:00:51 +08:00
hi-caicai
7b40c91e87 update docs 2016-03-11 15:45:45 +08:00
afc163
0752e94dd9 typo 2016-03-11 15:43:51 +08:00
afc163
26c4e07040 improve video in markdown 2016-03-11 15:21:32 +08:00
hi-caicai
fb59c4d00b update docs 2016-03-11 10:33:03 +08:00
jljsj
f4c2bb36a8 Merge branch 'new-design-language' of github.com:ant-design/ant-design into new-design-language 2016-03-10 18:10:33 +08:00
jljsj
dfe084fbff add transition, remove page-transition 2016-03-10 18:06:39 +08:00
afc163
6f2ad7143d Merge branch 'new-design-language' of github.com:ant-design/ant-design into new-design-language 2016-03-10 17:44:15 +08:00
afc163
f9b33a9f09 update design docs 2016-03-10 17:43:54 +08:00
hi-caicai
7b13bf5f6e update docs 2016-03-10 17:41:46 +08:00
hi-caicai
ff1d507d77 Merge branch 'new-design-language' of https://github.com/ant-design/ant-design into new-design-language 2016-03-10 17:23:39 +08:00
hi-caicai
88c9279139 update docs 2016-03-10 17:21:37 +08:00
afc163
6e13535919 update docs 2016-03-10 15:19:50 +08:00
Benjy Cui
e770598612 feat: support easing.md && page-transition.md 2016-03-10 10:50:40 +08:00
Benjy Cui
cc0bad9ef9 chore: update UI 2016-03-10 10:50:39 +08:00
Benjy Cui
4e3f446279 chore: normalize build procedure 2016-03-10 10:50:38 +08:00
Benjy Cui
26ec81611f chore: update motion.md && colors.md 2016-03-10 10:50:38 +08:00
Benjy Cui
e8b9c5d2a2 chore: update website 2016-03-10 10:50:38 +08:00
Benjy Cui
4ff4a64f6a chore: normalize build procedure 2016-03-10 10:50:38 +08:00
Benjy Cui
5a08d410c5 chore: support preview image in Modal 2016-03-10 10:50:37 +08:00
Benjy Cui
b755dd5050 chore: add Practice and Pattern page 2016-03-10 10:50:37 +08:00
afc163
ba55b13039 update text 2016-03-09 19:11:08 +08:00
afc163
e5ba8b72f5 upgrade polyfill files 2016-03-09 16:01:02 +08:00
afc163
6d9f26088b Add pictures 2016-03-09 15:56:00 +08:00
afc163
b838d3b40f Add pictures 2016-03-08 21:03:05 +08:00
afc163
b6ffd6ced1 update docs 2016-03-08 20:05:50 +08:00
afc163
7d3ebba564 Add design principles 2016-03-08 17:45:19 +08:00
afc163
b05cabf507 Add new pages 2016-03-08 17:02:45 +08:00
afc163
91d553d044 docs: fix link 2016-03-03 15:36:33 +08:00
afc163
4953653947 update doc 2016-02-26 18:32:52 +08:00
afc163
a33f332ac4 Fix site style 2016-02-23 16:30:05 +08:00
afc163
c63a752de8 update site style 2016-02-23 01:12:17 +08:00
afc163
203cdd9c35 Fix site code style 2016-02-22 14:53:57 +08:00
afc163
e44a9423a5 Update upgrade-notes.md 2016-02-17 23:21:33 +08:00
afc163
51742d3ebd update doc url 2016-02-03 22:16:17 +08:00
afc163
ce9e377a38 update doc 2016-02-02 18:24:49 +08:00
afc163
51d1537cbc upgrade CHANGELOG.md & upgrade-notes.md 2016-02-01 16:11:14 +08:00
Benjy Cui
d037290eab Merge pull request #958 from ant-design/docs-upgrade 
docs: upgrade-nodes add 0.11 => 0.12
 2016-02-01 15:22:25 +08:00
afc163
5c978ac1bd update docs for ie8 2016-02-01 14:44:18 +08:00
然则
5c72336705 add tree docs-upgrade #958 2016-02-01 10:47:59 +08:00
Benjy Cui
1f83809d25 docs: upgrade-nodes add 0.11 => 0.12 2016-02-01 10:47:59 +08:00
afc163
eee8dd9f48 update introduce.md 2016-01-28 18:56:59 +08:00
afc163
ffd8b8a7b9 Merge branch 'master' into develop-0.12.0 2016-01-28 12:41:04 +08:00
afc163
c6e39ee5ac minify pics 2016-01-26 14:17:32 +08:00
afc163
cf077230d7 Merge branch 'master' into develop-0.12.0 2016-01-26 13:44:31 +08:00
afc163
c56583b6a6 update docs 2016-01-25 18:12:44 +08:00
afc163
7bfbf0aae0 change default port in getting-started 2016-01-23 15:31:19 +08:00
afc163
a4204a3d1f update practice doc 2016-01-22 17:46:55 +08:00
afc163
d5dbb2e592 use codepen replace jsfiddle example 2016-01-20 15:42:52 +08:00
afc163
4f8777546a Docs: Add ant-tool home page 2016-01-19 17:30:58 +08:00
afc163
7404e759a9 fix whitespace 2016-01-18 10:51:49 +08:00
afc163
c99d1f1000 Docs: update some style 2016-01-17 15:19:29 +08:00
afc163
e5f7c8b432 fix some site style 2016-01-17 13:31:56 +08:00
afc163
1405600919 Add IE8 issues link 2016-01-14 14:29:30 +08:00
afc163
f22eeb179b update resource link 2016-01-14 14:19:12 +08:00
afc163
f1ff04a1ce Docs: fix markdown and remove console 2016-01-14 13:59:12 +08:00
afc163
29b99bbf69 Merge branch 'master' of github.com:ant-design/ant-design 2016-01-14 11:26:09 +08:00
afc163
56a0badded fix links 2016-01-14 11:25:46 +08:00
Guan Hao
9e2d1be3d6 fix typo in layout demo code 2016-01-14 11:08:57 +08:00
afc163
5e635654ed update download page style 2016-01-14 00:33:12 +08:00
afc163
1d75c19895 update style 2016-01-14 00:26:51 +08:00
afc163
be1a353301 update pictures 2016-01-13 21:38:02 +08:00
afc163
2381b78af2 upgrade ant-ux link 2016-01-13 17:54:53 +08:00
afc163
b14c5820e0 update download.md 2016-01-13 16:27:31 +08:00
afc163
33f2863e68 update new design spec style 2016-01-13 15:11:54 +08:00
afc163
57a6535a4c upgrade pattern form.md 2016-01-12 14:12:21 +08:00
afc163
1819a9dba0 fix typo 2016-01-11 21:26:59 +08:00
afc163
5306d32cda update cases image pack style 2016-01-11 18:56:34 +08:00
afc163
f4f967ec8e update cases image pack style 2016-01-11 18:40:40 +08:00
afc163
0002062eb8 update table size pattern 2016-01-11 17:44:01 +08:00
afc163
afe381e861 update pictures 2016-01-11 14:26:44 +08:00
afc163
d75e8f4dc1 update introduce doc 2016-01-11 12:25:26 +08:00
afc163
c73b1c091f update resource page 2016-01-11 12:17:00 +08:00
afc163
adf9a11b8b fix docs 2016-01-10 19:48:39 +08:00
afc163
016b04f4d3 upgrade table pattern 2016-01-10 19:40:43 +08:00
afc163
ca2edd2b1d Add pictures 2016-01-10 19:19:14 +08:00
afc163
bbf302cc93 update pics 2016-01-09 17:52:34 +08:00
afc163
b4c2d9bf8f update toc style 2016-01-09 17:32:40 +08:00
afc163
658660a158 Add images carousel 2016-01-09 16:04:01 +08:00
afc163
f051e8828e update new docs 2016-01-08 18:27:01 +08:00
afc163
c821b2cf03 update new document 2016-01-08 16:09:11 +08:00
afc163
e87b4649a4 Add some docs ... 2016-01-07 17:00:42 +08:00
afc163
8be1ffdfe0 update docs 2016-01-06 22:34:34 +08:00
afc163
3455644a52 Add preview image modal 2016-01-06 20:58:35 +08:00
afc163
c3e404f6ea update page style 2016-01-06 18:49:43 +08:00
afc163
f267d4fda7 change docs directories 2016-01-06 17:28:49 +08:00
shouyong
803a8d4ccc 修复Demo无效的BUG 
DatePicker的onSelect接口变更为onChange。
 2016-01-01 10:35:11 +08:00
afc163
2ca31c7cac update jsfiddle link 2015-12-31 18:32:19 +08:00
afc163
b89b98374d remove antd-bin from document 2015-12-30 22:20:30 +08:00
afc163
97993b3bed update jsfiddle examples 2015-12-30 15:19:31 +08:00
afc163
93f95df33a update document 2015-12-29 16:14:59 +08:00
afc163
43caba2067 update doc 2015-12-28 16:10:53 +08:00
Benjy Cui
292aacc156 docs: update links 2015-12-27 17:05:43 +08:00
afc163
ed5d2f0731 improve docs 2015-12-27 16:56:44 +08:00
afc163
1b8cdaf45a update upgrade nodes 2015-12-27 16:56:44 +08:00
afc163
4cae512dbf improve CHANGELOG a d upgrade notes 2015-12-27 16:56:44 +08:00
Benjy Cui
841de74d18 docs: update CHANGELOG.md and upgrade-nodes.md 2015-12-27 16:56:44 +08:00
afc163
c9bb2df977 update links 2015-12-22 18:05:15 +08:00
Bozhao
1055a83bde small change 2015-12-17 20:31:20 -08:00
yubozhao
e8a671d426 Add basic English doc for install 2015-12-17 10:44:22 -08:00
afc163
193e77fdd9 update shim scripts link 2015-12-16 20:14:36 +08:00
afc163
7b6fd3128c update docs 2015-12-16 15:26:14 +08:00
afc163
d1fc49f885 update docs 2015-12-16 15:14:42 +08:00
afc163
4bb18780e5 update import document 2015-12-16 15:04:51 +08:00
afc163
d4850c418f Merge branch 'master' into develop-0.11.0 2015-12-12 16:01:43 +08:00
afc163
dcc15110b4 fix docs 2015-12-12 15:58:59 +08:00
afc163
3f942d6cf5 update upgrade notes 2015-12-10 16:45:20 +08:00
afc163
d759d1f489 Datepicker => DatePicker, Timepicker => TimePicker 2015-12-10 16:30:18 +08:00
afc163
f3d5607f13 update document for style import, #567 2015-12-08 18:05:01 +08:00
afc163
edeec8e503 update document 2015-12-06 17:40:25 +08:00
afc163
46e3930d62 update document 2015-12-06 17:40:04 +08:00
afc163
52c26872cb update docs 2015-12-05 01:08:33 +08:00
afc163
aed50b2cc0 update docs 2015-12-05 01:03:08 +08:00
afc163
2e010aea39 Fix document links 2015-12-04 17:12:46 +08:00
afc163
cc9c6390b8 Fix document links 2015-12-04 17:11:18 +08:00
Benjy Cui
454ba1b8d5 docs: update getting-started.md 2015-11-30 17:09:16 +08:00
afc163
562697423b Add media-match to polyfil 2015-11-27 15:43:15 +08:00
afc163
b261262f8e update doc 2015-11-23 16:02:31 +08:00
yiminghe
780e89e73a update antd at jsfiddle 2015-11-23 15:42:56 +08:00
yiminghe
a1542c7495 update antd at jsfiddle 2015-11-23 15:39:49 +08:00
yiminghe
e47e1c8db6 add jsfiddle demo 2015-11-23 15:20:42 +08:00
afc163
9bee0ab777 update upgrade-to-0.10.md 2015-11-20 21:09:47 +08:00
afc163
821d0927df upgrade doc for dropdown change 2015-11-20 14:30:09 +08:00
afc163
d17f6a9c30 update doc 2015-11-20 14:15:21 +08:00
afc163
b55ec73add upgrade getting-started 2015-11-20 11:33:42 +08:00
afc163
3183c9bf39 update links 2015-11-20 11:28:24 +08:00
afc163
2f459dc9bb upgrade changelog for 0.10.0 2015-11-19 21:34:05 +08:00
afc163
5c9137dcf7 Fix highlight bar in document for window browser 2015-11-18 17:27:58 +08:00
afc163
0e13be7500 update document 2015-11-17 16:33:47 +08:00
afc163
1105a21260 update docs 2015-11-14 21:38:31 +08:00
afc163
6c3fcea5a6 update introduce 2015-11-08 19:09:28 +08:00
afc163
3713c372cc update docs 2015-11-05 20:37:06 +08:00
afc163
9842ac9c72 update docs 2015-11-05 20:29:13 +08:00
afc163
366b8148b9 update docs 2015-11-05 20:24:18 +08:00
afc163
21116e1576 update introduce 2015-11-04 20:30:50 +08:00
afc163
1b8a30ca1f update document 2015-11-03 15:08:41 +08:00
afc163
045a50c32c update shim script src 2015-11-02 16:21:49 +08:00
sorrycc
f9db243f50 update getting-started.md 2015-10-29 16:31:16 +08:00
afc163
9266bbeaed Merge master 2015-10-27 14:36:31 +08:00
afc163
e66fce6de9 Merge branch 'master' into develop-0.10.0 2015-10-27 14:31:51 +08:00
afc163
2b3c6d6cfb update install antd-bin version 2015-10-27 14:27:02 +08:00
afc163
11fe24087a update document 2015-10-27 14:26:21 +08:00
afc163
157faaf458 Merge master for 0.9.2 upgrade 2015-10-26 17:38:27 +08:00
afc163
4daa815fe4 update document for 0.9.x 2015-10-26 17:12:40 +08:00
afc163
4bc1d2eb72 update getting-started document 2015-10-22 16:03:59 +08:00
afc163
30eed4f32d update getting-started document 2015-10-22 15:54:03 +08:00
afc163
2cba093561 update docs/getting-started.md 2015-10-22 11:01:36 +08:00
afc163
3ffda2c4a1 Fix demo links 2015-10-22 10:30:13 +08:00
afc163
08b3d8ff67 Fix documentation 2015-10-21 21:00:05 +08:00
afc163
b4e7c13059 Fix click 2015-10-21 20:41:05 +08:00
Benjy Cui
f7a8b11243 chore: remove deprecated APIs 2015-10-21 17:59:57 +08:00
yiminghe
76b0f673ec beta2 2015-10-20 16:47:55 +08:00
chencheng (云谦)
a976b65ab1 remove react external 2015-10-19 16:09:18 +08:00
afc163
37da0caf2c Remove importing jquery 2015-10-10 14:20:22 +08:00
afc163
2dd307af42 update document 2015-09-15 01:05:14 +08:00
afc163
32b5035113 update documentation 2015-09-09 22:56:26 +08:00
afc163
47af941dc4 Fix badge image 2015-09-09 10:25:58 +08:00
afc163
03a300ff46 update introduce.md 2015-09-08 14:05:03 +08:00
afc163
26a1ce78ab update download.md 2015-09-08 12:15:00 +08:00
afc163
74b0bb28d1 update demo code 2015-08-28 11:15:53 +08:00
afc163
91048da7d7 update started demo 2015-08-26 16:38:55 +08:00
afc163
9591cbb825 update documentation 2015-08-25 20:16:29 +08:00
afc163
d1a0f9ac80 update text 2015-08-24 17:26:42 +08:00
afc163
29e5994236 update introduce.md 2015-08-24 16:03:21 +08:00
afc163
018b25bfae update documentation 2015-08-24 15:57:00 +08:00
afc163
97ccc96ab0 update site style 2015-08-22 21:08:18 +08:00
afc163
d7ff80342f update spec/introduce.md 2015-08-22 20:51:10 +08:00
afc163
89407aa12a Change site struction 2015-08-22 19:13:06 +08:00
afc163
8ac2177bc7 sidebar update 2015-08-22 17:21:47 +08:00
afc163
f260b2145f update description 2015-08-21 17:00:33 +08:00
afc163
328722a090 update docs/getting-started.md 2015-08-20 20:58:42 +08:00
sorrycc
12c17f7dd3 update get-started.md, Close #169 2015-08-20 18:19:51 +08:00
afc163
e03d2488e5 update document 2015-08-20 15:04:34 +08:00
afc163
56122af642 update docs/download.md 2015-08-11 21:07:49 +08:00
afc163
2507bba7a4 update markdown style, min file 2015-08-03 18:43:23 +08:00
afc163
2b058603a1 upgrade es5-shim version 2015-08-03 18:41:54 +08:00
afc163
d48f745f04 update README.md 2015-07-23 21:21:40 +08:00
yiminghe
aacf593c24 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-21 19:12:27 +08:00
yiminghe
ed29c1a274 use import 2015-07-21 19:09:14 +08:00
afc163
8e3ac6b6a5 update build scripts 2015-07-21 17:55:14 +08:00
afc163
b0e62edf27 update download.md 2015-07-21 17:11:49 +08:00
afc163
cdb2701f17 download link 2015-07-21 12:14:08 +08:00
afc163
98024733f0 改变称呼 2015-07-20 16:25:36 +08:00
afc163
8c99f60bfb fix jsfiddle example after 45ce3ad 2015-07-20 16:20:01 +08:00
yiminghe
45ce3ad0ca update get-started 2015-07-20 16:07:02 +08:00
afc163
6a8921ddee update getting started document 2015-07-17 13:55:39 +08:00
afc163
3181ac884b update README.md 2015-07-17 00:28:15 +08:00
afc163
42b66fa581 update getting-started demo 2015-07-15 18:22:17 +08:00
afc163
8574d16697 update document 2015-07-15 18:17:05 +08:00
偏右
26d94a9cbf Update getting-started.md 2015-07-09 14:22:38 +08:00
偏右
cfe92160fc Update getting-started.md 2015-07-09 14:00:13 +08:00
afc163
63ab4b5db4 update README.md 2015-07-08 20:08:19 +08:00
afc163
d87ad54b44 update doc 2015-07-08 12:55:23 +08:00
sorrycc
75161a8459 typo fix 2015-07-07 16:37:45 +08:00
afc163
db30835c0e require antd 2015-07-06 20:04:26 +08:00
afc163
879685eeb5 update download.md 2015-07-06 15:53:38 +08:00
afc163
396f948159 update download.md 2015-07-06 15:51:26 +08:00
afc163
0f3b3253e1 update document 2015-07-06 15:03:11 +08:00
afc163
2f54c531fb npm badge 2015-07-06 14:44:03 +08:00
afc163
9f2e4a370e update docs/introducemd 2015-07-06 14:41:37 +08:00
afc163
2ca5715a9f code style 2015-07-06 14:35:08 +08:00
afc163
9cf36589a9 update version 2015-07-05 23:40:24 +08:00
afc163
494d2c213f download document update 2015-07-05 23:38:13 +08:00
afc163
8d6eeb5cae update directory structure 2015-07-05 15:43:07 +08:00
afc163
95054e3ef8 download 2015-07-04 16:31:48 +08:00
afc163
325406776b download page 2015-07-04 16:20:50 +08:00
afc163
a3dea7bfca update document 2015-07-04 01:54:29 +08:00
afc163
548c6ab362 update doc 2015-07-03 18:13:53 +08:00
afc163
8402a67dd4 update doc 2015-07-03 18:12:38 +08:00
afc163
6a79fd88b4 update documentation 2015-07-03 18:06:47 +08:00
afc163
ec0bb21373 update documentation 2015-06-16 21:16:04 +08:00
afc163
8efe74249a update README.md 2015-06-15 18:18:42 +08:00
afc163
1ccee10474 update README.md 2015-06-15 18:16:21 +08:00
afc163
975633ed1a update README.md 2015-06-14 18:28:08 +08:00
afc163
b68107a83c update doc title 2015-06-08 12:43:37 +08:00
afc163
c89536397f sidebar for docs 2015-06-04 17:59:27 +08:00
afc163
cdcaa0d9ff sidebar for docs 2015-06-04 17:56:09 +08:00
afc163
5453287e42 outline for getting-started 2015-05-27 17:31:01 +08:00
afc163
2d6285a31b fix pages 2015-05-09 18:52:17 +08:00
afc163
84424872f7 fix header nav style 2015-05-09 18:40:01 +08:00
afc163
301f6d659a update layout and cases 2015-05-08 20:45:08 +08:00
afc163
08900df2fb rm src 2015-05-07 20:54:19 +08:00