Commit Graph

837 Commits

Author SHA1 Message Date
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
Zhimin YE (Rex) 466f69d30a Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/cookbook/_data.json
#	tools/api-builder/angular.io-package/templates/class.template.html
2016-06-15 12:01:54 +01:00
Zhimin(Rex) YE 04fd6f7102 review of server-communication to line 593 2016-06-14 23:43:52 +01:00
Deborah Kurata e7f3fc61ce docs(cb-vs2015) new cookbook for Visual Studio 2015 QuickStart
closes #1502
2016-06-13 23:55:14 -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 df9a0177ea 文字微调 2016-06-14 13:00:36 +08:00
Zhicheng Wang bc2e4b83c0 把所有全角括号改成了半角的 2016-06-14 09:26:54 +08:00
Zhicheng Wang a7e9ff78ff 校对完了词汇表,统一了双语标注 2016-06-14 09:25:26 +08:00
Zhicheng Wang c1051cc8e1 微调
为词汇表加上了双语备注
2016-06-14 07:54:46 +08:00
Patrice Chalin ca2e5c5d1d docs(toh-4/ts): copyedits
closes #1638
2016-06-13 11:40:30 -07:00
Helmi 7f256eea75 Fix typo in 'Simulating the web api' section.
closes #1655
2016-06-13 11:05:15 -07:00
Foxandxss 61ad427319 docs(toh): add missing snippets
closes #1649
2016-06-13 10:46:53 -07:00
Patrice Chalin fd46bf4970 docs(toh-5/ts): minor edits
closes #1644
2016-06-13 10:45:23 -07:00
Patrice Chalin 070cb5a193 docs(toh-3/ts): copyedits
closes #1630
2016-06-13 10:36:04 -07:00
Patrice Chalin 16848fc822 docs(toh-2/ts): copyedits
closes #1622
2016-06-13 10:34:19 -07:00
Patrice Chalin 2fc7e5ab50 docs(toh-1/ts): minor edits
closes #1615
- Fixed HTML.
- Removed unnecessary snippet since it is in the code.
- Copyedit: (Hero property) -> (hero property).
2016-06-13 10:28:04 -07:00
Brian Olore ce05f9b4f9 docs(style-guide): make each style clickable for easier referencing 2016-06-13 10:24:58 -07:00
Zhicheng Wang f389c57ede 来自网友Z的修改意见 2016-06-13 17:22:28 +08:00
Zhicheng Wang c802c2b5dc 来自网友张旋和Z的修改意见 2016-06-13 17:20:08 +08:00
Zhicheng Wang e338333e2f Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
2016-06-13 16:39:34 +08:00
Zhicheng Wang 9789413bda 文字微调 2016-06-13 16:35:21 +08:00
Foxandxss 074a33a622 chore: tslint sweep done 2016-06-13 02:40:28 +02:00
Zhicheng Wang eafa80c89b 校对了ts-to-js部分 2016-06-11 21:59:43 +08:00
Zhicheng Wang 0b8712d729 微调 2016-06-11 12:08:02 +08:00
Zhicheng Wang f8fd5a1ebd 更明确了ngOnInit的触发时机:每个输入属性的ngOnChanges都完成首次触发之后。 2016-06-11 11:28:16 +08:00
Zhicheng Wang 164244d77a 修正了api的链接(仅中文版) 2016-06-10 14:45:12 +08:00
Zhicheng Wang 6b8e09bf2b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/guide/dependency-injection.jade
2016-06-10 13:34:18 +08:00
Zhimin YE (Rex) f694255b7b review of component-relative-paths.jade 2016-06-09 14:34:12 +01:00
Zhimin YE (Rex) 8ae3d52cbc minor change to ts-to-js.jade review. 2016-06-09 14:18:27 +01:00
Zhimin YE (Rex) 0bc85d4850 a1-a2-quick-reference.jade review is done. 2016-06-09 09:44:21 +01:00
Patrice Chalin 3c77a7fcd1 docs(basics/di): minor edits following TS switch to provider object literal (#1600)
Minor edits:
- Dart side adjustments following #1594.
- Renamed example '3a' to just '3' and tweaked the logger message
- Removed obsolete Dart block.
2016-06-08 09:25:48 -07:00
Zhimin YE (Rex) f24ee2181c a1-a2-quick-reference.jade review up to pipe/number 2016-06-08 17:02:41 +01:00
Zhimin YE (Rex) cc96a317a0 review of upgrade.jade is done. 2016-06-08 16:38:38 +01:00
Zhicheng Wang 3fbdfeb710 修正链接 2016-06-08 17:07:05 +08:00
Zhicheng Wang 80c36ac7f5 Merge remote-tracking branch 'origin/master' 2016-06-08 17:01:20 +08:00
Zhicheng Wang 3d01acbf7b 微调翻译
允许翻译中出现省略号
2016-06-08 16:58:36 +08:00
Zhicheng Wang 934b425cc8 微调翻译 2016-06-08 16:22:55 +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
Foxandxss fb49cbe33f docs(cli-quickstart): add cli 5 min quickstart
closes #1606
2016-06-07 18:51:27 -07:00
Patrice Chalin 7e52648ee7 docs(toh): update live example links (#1602) 2016-06-07 15:51:25 -07:00
Zhimin(Rex) YE b0e86f664f upgrade.jade review: to line 1622. 2016-06-07 22:22:48 +01:00
Zhimin YE (Rex) 90a2f1aefa upgrade.jade to line 461 2016-06-07 17:10:02 +01:00
Zhimin YE (Rex) 8867357e73 webpack.jade review is done. 2016-06-07 13:43:15 +01:00
Zhimin YE (Rex) 18febb61f0 typescript-configuration.jade review is done. 2016-06-07 11:12:49 +01:00
Zhimin YE (Rex) 8ef81f1ccb testing-an-angular-pipe review is done. 2016-06-07 10:43:29 +01:00
Zhimin YE (Rex) ce9f3939e5 review of first-app-tests.jade is done. 2016-06-07 09:24:27 +01:00
Zhicheng Wang 0a967baf51 Merge remote-tracking branch 'origin/master' 2016-06-07 09:47:24 +08:00
Zhicheng Wang 24761d76b8 文字微调 2016-06-07 09:46:26 +08:00