Commit Graph

59 Commits

Author SHA1 Message Date
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 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
priestch b21c90c358 fix(doc): fix 404 problem of some api url 2016-06-28 22:25:24 -07:00
Zhicheng Wang 64b9e476fb 把alternative统一改为备选或替代品(取决于语境) 2016-06-21 07:54:34 +08:00
Zhicheng Wang bc2e4b83c0 把所有全角括号改成了半角的 2016-06-14 09:26:54 +08:00
Zhicheng Wang c802c2b5dc 来自网友张旋和Z的修改意见 2016-06-13 17:20:08 +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
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
Zhicheng Wang 82f5b1c035 根据 [Joeylin] 的反馈意见,做出微调 2016-06-05 06:39:39 +08:00
Zhimin(Rex) YE cb8818f171 patch up guide\dependency-injection.jade after official updates. 2016-06-04 19:54:25 +01:00
Zhimin(Rex) YE 633964ac2f Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/upgrade.jade
2016-06-04 17:52:51 +01:00
Zhimin(Rex) YE 5ae026ced3 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/_examples/dependency-injection/ts/app/main.1.ts
#	public/docs/ts/latest/guide/dependency-injection.jade
2016-06-04 16:45:10 +01:00
Foxandxss c185c3548c chore: use the provide object literal
closes #1594
replace `provide(...{use:...})` with `{provide: ..., use...}` syntax
2016-06-04 01:33:36 -07:00
Patrice Chalin 05864c2584 docs(dependency-injection): revised Dart and TS code and prose (#1573)
docs(dependency-injection): revise Dart and TS code and prose
2016-06-03 11:16:46 -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
Vikash 8569479423 docs: fix numerous typos in many doc files.
closes #1509
2016-06-01 01:08:56 -07:00
Zhicheng Wang bea07ebfca 微调 2016-06-01 11:21:18 +08:00
Zhimin YE (Rex) 070dd1c9e1 guide/di review is done. 2016-05-31 15:40:05 +01:00
Zhimin(Rex) YE ac67a9c103 di review 2016-05-30 22:35:17 +01:00
Zhimin(Rex) YE 399df5ae59 基础知识的DI-校对一半了 2016-05-28 23:10:39 +01:00
Zhimin YE (Rex) 17d6eeb1e2 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/quickstart.jade
2016-05-25 11:13:25 +01:00
Torgeir Helgevold 1644673d6c docs(dependency-injection): show providers using map literals 2016-05-23 19:07:59 -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 b97a9585c2 文字微调 2016-05-18 13:10:58 +08:00
Rex Ye 990ecd8f70 review for dependency-injection.jade in guide. 2016-05-17 12:08:00 +01:00
Zhicheng Wang 8e84ec2c15 基础知识-依赖注入 一审完毕 2016-05-16 19:47:52 +08:00
Zhicheng Wang 33292b942c 把某些Provider批量替换为供应商
架构篇校对了一部分
2016-05-14 22:23:18 +08:00
Zhicheng Wang f397bf6608 把“Live Example 鲜活范例”统一译成“在线例子” 2016-05-11 14:47:32 +08:00
Zhicheng Wang a2d6add5fe 翻译了大部分“模板语法”章 2016-05-08 21:00:37 +08:00
Zhicheng Wang efd0a42eac 翻译完了DI 2016-05-05 23:32:48 +08:00
Zhicheng Wang 296afedd4a 翻译了一点DI的内容 2016-05-04 23:12:25 +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
Zhicheng Wang 40346025b2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/_includes/_main-nav.jade
#	public/_includes/_version-dropdown.jade
#	public/docs/_includes/_side-nav.jade
2016-05-03 20:21:29 +08:00
Filipe Silva 0a606a1b41 chore(ts): updating to beta.16 2016-04-26 00:22:25 -07:00
Naomi Black 6d13db472a chore(links): make links to API docs relative 2016-04-19 17:44:38 -07:00
Alberto Jiménez López 8e7c552452 docs: Remove double 'the' & missing dashes in several files
closes #1073
2016-04-11 21:53:28 -07:00
Torgeir Helgevold c1f2c397ff docs: add DI cookbook 2016-04-05 10:15:18 -07:00
Kathy Walrath e2c77ad55c docs(dependency-injection): tweak Dart wording
closes #1017
2016-03-30 10:46:54 -07:00
Kathy Walrath 10877bdbfc docs(dependency-injection): add Dart version, tweak TS version
closes #972
2016-03-25 15:21:11 -07:00
Josh Otis 746a6649b2 chore: new flat left navigation panel (all language tracks) 2016-03-03 04:51:52 -08:00
Ward Bell ad7f172ea5 docs: share 'styles.css' across all samples all langs; fix styles 2016-02-28 12:47:01 -08:00
Kathy Walrath 4d9daf3493 docs(dependency-injection): copy edit the TypeScript version
Also fix print style

closes #826
2016-02-18 14:59:30 -08:00
Ward Bell ab6d362650 docs(dependency injection): minor tweaks
closes #755
2016-01-26 02:54:53 -08:00
Pascal Precht 76a8d022a7 docs(dependency-injection): added DI examples; update/expand text
closes #748
2016-01-25 23:34:40 -08:00
Progger d64d3320b4 docs(dependency-injection): typo
closes #628
2016-01-03 15:48:07 -08:00
Deborah Kurata c9ea1e52c1 docs(attribute-directive): new chapter + dev-guide chapter shuffle
closes #437
2015-12-02 19:01:27 -08:00
Brady Potaczek 347c79c514 docs: dependency-injection.jade
Fix absolute path to relative path
closes #419
2015-11-30 16:11:56 -08:00
Mithun Patel 4b4582cb17 Fix typos in Forms & DI chapters; add links in testing docs
closes #398
2015-11-23 17:03:06 -08:00