63 Commits

Author SHA1 Message Date
Yang Lin
febe110eb0 Polish toh-pt2.jade (round 2) 2016-12-01 21:54:35 +08:00
Yang Lin
5a7745fb27 Upgrade to 2.2.0 2016-11-22 20:07:16 +08:00
Yang Lin
1cd0742230 more polish 2016-11-06 11:41:49 +08:00
Yang Lin
1586163b0d Polish top pt2 2016-11-06 11:41:49 +08:00
Zhimin YE
4578087fa5 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	README.md
#	harp.json
#	public/_includes/_hero-home.jade
#	public/docs/_examples/quickstart/ts/systemjs.config.1.js
#	public/docs/dart/latest/_util-fns.jade
#	public/docs/dart/latest/api/_data.json
#	public/docs/dart/latest/api/index.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/visual-studio-2015.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/animations.jade
#	public/docs/ts/latest/guide/change-log.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade

Server Communication and Visual studio 2015 require further merging.
2016-11-03 15:38:23 +00:00
Filipe Silva
0d49fecd30 chore: update to @types (#1872)
* chore: update examples to @types
* fix toh-6 aot and add types link
2016-10-20 17:01:16 -07:00
rexebin
f7c60a07df fix: change all 他 > 它 2016-09-25 19:50:45 +01:00
rexebin
d9af771f8d Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	README.md
#	public/contribute.jade
#	public/docs/_includes/_side-nav.jade
#	public/docs/_includes/_ts-temp.jade
#	public/docs/index.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/component-relative-paths.jade
#	public/docs/ts/latest/cookbook/index.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/cookbook/visual-studio-2015.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/animations.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/index.jade
#	public/support.jade
2016-09-23 22:13:02 +01:00
Jesús Rodríguez
693f6ae462 chore: rename Angular 2 to simply Angular (#2402) 2016-09-19 20:24:40 -07:00
Zhimin YE (Rex)
94d48f2b95 fix: toh1 and 2 2016-09-19 10:00:09 +01:00
Zhicheng Wang
6f6f89ed9c 把所有“内建”改为“内置” 2016-09-17 11:46:17 +08:00
Zhicheng Wang
2a1c3626c5 去掉了大部分儿化音
感谢来自github的iloveyo123u1和Elderry
2016-09-12 08:35:02 +08:00
Zhimin YE (Rex)
654030f09d Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt2.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-08-23 14:02:54 +01:00
Jesús Rodríguez
a2d6ea3a97 docs(toh): consistency fix
closes #2087
2016-08-17 17:47:15 -07:00
Zhimin YE (Rex)
f26ec0a889 (review:) Quick starter and TOH, patch up new paragraphs and mis-alignments. 2016-08-16 10:16:31 +01:00
Zhicheng Wang
94aa3664ab Merge remote-tracking branch 'origin/master'
# Conflicts:
#	.gitignore
#	public/docs/_examples/cb-component-communication/ts/app/app.component.ts
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-08-12 07:57:51 +08:00
Peter Bacon Darwin
d79adb2422 docs(rc5): update docs and plunkers for rc5 2016-08-09 11:48:07 -07:00
Zhicheng Wang
28fe7d848f 把“作用范围”批量改为“作用域” 2016-07-24 17:31:51 +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
52c118ef8a 微调 2016-06-20 15:55:30 +08:00
Zhicheng Wang
20c59f9e4a Add some blank lines, to avoid unnecessary conflicts on merging. 2016-06-15 23:31:28 +08: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
16848fc822 docs(toh-2/ts): copyedits
closes #1622
2016-06-13 10:34:19 -07: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
Zhicheng Wang
fd69ea3270 把部分expose统一译为暴露 2016-05-16 23:15:02 +08:00
Zhicheng Wang
898539d8d5 基础知识-显示数据 一审了一半儿 2016-05-16 13:44:00 +08:00
Zhicheng Wang
8beee32a65 教程-服务 一审完毕 2016-05-12 17:50:30 +08:00
Zhicheng Wang
f413edce53 修订了教程-多个组件的一部分
部分“标记(tag)”批量替换为“标签”
2016-05-11 21:04:09 +08:00
Zhicheng Wang
15c927b29f “教程-主从结构”一审完毕
把内置批量替换为内建
2016-05-11 20:34:47 +08:00
Zhicheng Wang
f397bf6608 把“Live Example 鲜活范例”统一译成“在线例子” 2016-05-11 14:47:32 +08: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
Filipe Silva
ebc022e475 docs: update prose for the let change to ngFor 2016-04-28 18:37:45 -07:00
Zhicheng Wang
de46beef2d 翻译完了displaying-data 2016-04-23 14:54:01 +08:00
Zhicheng Wang
bc9f46722f 教程第五章翻译了多一半儿,把黑板报批量改为仪表盘,把英雄之旅批量改为英雄指南 2016-04-17 23:31:22 +08:00
Zhicheng Wang
3cf6ca5f7e 第四章翻译了一半儿 2016-04-16 16:43:13 +08:00
Zhicheng Wang
e42953db5c 教程第三章译了一点点 2016-04-14 22:35:42 +08:00
Zhicheng Wang
37d5fbcf1c 把display的译法从“展示”批量改为“显示”
译完第二章
2016-04-14 21:45:12 +08:00
Zhicheng Wang
3e89409212 第二节翻译了一部分 2016-04-13 19:34:31 +08:00
Zhicheng Wang
84e96391ca 完成了导航菜单
完成了部分公共页面
完成了部分教程
2016-04-13 08:53:17 +08:00
Foxandxss
5f73911eaf chore(toh): change inputs array for input decorator/hero now a class 2016-03-25 16:51:46 -07:00
Josh Otis
746a6649b2 chore: new flat left navigation panel (all language tracks) 2016-03-03 04:51:52 -08:00
Ward Bell
3d992384c3 chore(devguide/ts): to beta.6 + typings + related doc updates 2016-02-12 00:56:22 -08:00
Ward Bell
79d3d9f0ad docs(samples): convert boot.ts -> main.ts
plus router text fix and missed beta.2 update to QS.js
closes #773
2016-01-28 17:32:38 -08:00
John Papa
f4c69b6ad0 docs(tutorial): update css and related fixes
closes #603
2015-12-23 09:36:16 -08:00
Ward Bell
82383bc673 docs(tutorial): part 3 + revisions to intro, 1 & 2
closes #573
2015-12-16 18:08:38 -08:00