iSharkFly-Docs/angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,531 Commits 5 Branches 1 Tag
Commit Graph

159 Commits

Author SHA1 Message Date
Benoit Lateltin
5bac678c60 docs(toh-pt5): fix typo in tutorial 
closes #1913
 2016-07-18 11:10:19 -07:00
Zhimin YE (Rex)
82c7f49784 review: toh-pt5.jade 2016-07-15 17:30:05 +01:00
Zhimin YE (Rex)
0e14785cba Merge remote-tracking branch 'angular.io/master' 
# Conflicts:
#	README.md
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/testing/first-app-tests.jade
#	public/docs/ts/latest/testing/jasmine-testing-101.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
 2016-07-15 15:52:34 +01:00
Brandon Roberts
5104470558 docs(router): Removed refs to deprecated router; lowerCamelCase constants 
closes #1834
 2016-07-11 21:44:12 -07:00
Zhicheng Wang
210b076594 根据网上反馈去掉了路由名字，新版已经不需要了。 2016-07-11 12:46:21 +08:00
Zhicheng Wang
0303a18020 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	README.md
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/structural-directives.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/testing/testing-an-angular-pipe.jade
#	public/docs/ts/latest/tutorial/index.jade
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
 2016-07-07 08:15:51 +08:00
Patrice Chalin
b0e0d94b5c docs: revert Jade to markdown 
closes #1818
Previously, the markdown of some chapters was converted to Jade markup
to support the conditional exclusion of TS prose parts in Dart
chapters. This commit reverts some of that back to clean markdown,
thanks to a few custom directives.
 2016-07-05 23:03:30 -07:00
Zhicheng Wang
be4748bce0 修改了一系列小bug 
微调“关于”页面
 2016-07-05 08:35:08 +08:00
Zhicheng Wang
1a806de866 移除行尾不必要的空格 2016-07-01 08:26:45 +08:00
Zhicheng Wang
21fe9dc1d2 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	README.md
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/testing/first-app-tests.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/news.jade
 2016-07-01 08:24:23 +08:00
Brandon Roberts
f3189546a6 docs(toh-5): Upgraded tutorial to new router 2016-06-28 12:52:47 -07:00
Zhicheng Wang
c1b8183c38 Add some blank lines, to avoid unnecessary conflicts on merging. 2016-06-15 23:21:05 +08:00
Zhicheng Wang
6a5f4a0fc2 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	public/docs/ts/latest/tutorial/toh-pt5.jade
 2016-06-15 23:10:41 +08:00
Patrice Chalin
6e5d8e6491 docs(toh-5/dart): review edits and code cleanup (#1643) 2016-06-15 07:46:26 -07:00
Zhicheng Wang
7995cb4897 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
 2016-06-14 14:04:30 +08:00
Zhicheng Wang
bc2e4b83c0 把所有全角括号改成了半角的 2016-06-14 09:26:54 +08:00
Patrice Chalin
fd46bf4970 docs(toh-5/ts): minor edits 
closes #1644
 2016-06-13 10:45:23 -07:00
Zhicheng Wang
164244d77a 修正了api的链接（仅中文版） 2016-06-10 14:45:12 +08:00
Zhicheng Wang
f2dbdb3163 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	public/docs/_examples/cb-component-communication/e2e-spec.ts
#	public/docs/_examples/cb-component-communication/ts/app/app.component.ts
#	public/docs/_examples/dependency-injection/ts/app/main.1.ts
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
 2016-06-08 10:02:24 +08:00
Patrice Chalin
7e52648ee7 docs(toh): update live example links (#1602) 2016-06-07 15:51:25 -07:00
Zhimin YE (Rex)
72efc8f055 Merge remote-tracking branch 'remotes/angular.io/master' 
# Conflicts:
#	README.md
#	public/contribute.jade
#	public/docs/_examples/cb-component-communication/e2e-spec.ts
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
 2016-06-01 09:51:27 +01:00
Ward Bell
2f115a3425 chore: fix broken devguide links as of May 31 
Did not fix broken Dart and API links
 2016-06-01 00:52:22 -07:00
Christopher Thorne
3d868da4b7 docs(toh-pt5): change getHero to match toh-pt6 getHero 
closes #1551
 2016-05-31 22:31:04 -07:00
Zhicheng Wang
ae3b205c77 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
 2016-05-21 21:02:15 +08:00
Ward Bell
f9fea00824 docs(component-relative-paths): new cookbook 2016-05-20 20:33:38 -07:00
Zhicheng Wang
29df35d724 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	public/docs/ts/latest/tutorial/index.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
 2016-05-20 15:34:27 +08:00
Zhicheng Wang
aadbeb3ae9 修正一些合并中的问题 2016-05-19 19:23:01 +08:00
Ward Bell
a4bc455030 docs(toh): remove unneeded directive from heroes.component 2016-05-19 00:57:35 -07:00
Torgeir Helgevold
e4db340464 docs:(TOH chapter on Http) New Tour of Hero Chapter on Http 2016-05-18 23:38:08 -07:00
Zhicheng Wang
5f1f27e09c Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	public/_data.json
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/news.jade
#	public/resources/index.jade
 2016-05-19 13:33:02 +08:00
Zhicheng Wang
fd69ea3270 把部分expose统一译为暴露 2016-05-16 23:15:02 +08:00
Zhicheng Wang
5d92314efc 教程-路由 一审完毕 2016-05-12 22:56:12 +08:00
Zhicheng Wang
8beee32a65 教程-服务 一审完毕 2016-05-12 17:50:30 +08:00
Zhicheng Wang
f397bf6608 把“Live Example 鲜活范例”统一译成“在线例子” 2016-05-11 14:47:32 +08:00
Foxandxss
c8bdbd5ea9 docs(toh): link to deprecated router 
closes #1309
 2016-05-10 21:56:19 -07:00
Zhicheng Wang
99d89072d5 把所有误用的他改成它 2016-05-09 21:50:33 +08:00
Foxandxss
596825a8b1 docs: update all docs to partially comply the style-guide 2016-05-03 12:42:44 -06:00
Zhicheng Wang
583247f0f9 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	public/_data.json
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/_includes/_main-nav.jade
#	public/docs/_includes/_side-nav.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/features.jade
#	public/index.jade
 2016-05-03 22:33:20 +08:00
Ward Bell
3d5302adce chore: update to rc.0 2016-05-02 19:57:28 -07:00
Zhicheng Wang
de46beef2d 翻译完了displaying-data 2016-04-23 14:54:01 +08:00
Zhicheng Wang
b007e835db Merge branch 'master' of github.com:angular/angular.io 
# Conflicts:
#	public/docs/ts/latest/tutorial/toh-pt5.jade
 2016-04-20 20:09:50 +08:00
Zhicheng Wang
d21325fa55 完成了指南首页 
处理了排列不规范的列表翻译，以便将来可以统一实现对照翻译
 2016-04-20 20:07:39 +08:00
Naomi Black
6d13db472a chore(links): make links to API docs relative 2016-04-19 17:44:38 -07:00
Zhicheng Wang
b510dbcdcd 翻译完了教程第五章 2016-04-18 22:59:24 +08:00
Zhicheng Wang
bc9f46722f 教程第五章翻译了多一半儿，把黑板报批量改为仪表盘，把英雄之旅批量改为英雄指南 2016-04-17 23:31:22 +08:00
Foxandxss
b2f2fb87ec docs(toh): make a few corrections 
closes #967
 2016-03-17 21:09:54 -07:00
Ward Bell
beb8efc71f docs(toh-5) reworded templateUrl/styleUrls notes 2016-03-08 15:09:31 -08:00
Foxandxss
af1eaae873 docs(toh5): add better explanations for templateUrl 
closes #929
 2016-03-08 15:07:00 -08:00
Foxandxss
d6dc97722b docs(toh5): fix typo 
closes #930
 2016-03-08 14:46:31 -08:00
Josh Otis
746a6649b2 chore: new flat left navigation panel (all language tracks) 2016-03-03 04:51:52 -08:00