Commit Graph
1566 Commits
Author SHA1 Message Date
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
Chris Grieger 08d051d2f6 docs(testing): refer to 'lite-server' instead of 'live-server'.
closes #1737
Since the QuickStart uses 'lite-server', this should also be used for
the testing guide.
2016-07-14 14:39:59 -07:00
Foxandxss a8091f5b84 docs(style-guide): remove routing from TOC
closes #1856
2016-07-14 14:19:48 -07:00
Foxandxss abd860c3ca chore: update testing example to RC4
closes #1839
2016-07-14 14:11:02 -07:00
Foxandxss 8ddc93d211 docs(style-guide): create a route redirection
closes #1857
2016-07-14 14:09:19 -07:00
雪狼 657bf63bdf Merge pull request #34 from dreamapplehappy/dreamapple-contribute
翻译的一点修改: _logger修改为logger
2016-07-14 16:51:12 +08:00
Zhicheng Wang 221f00c8b7 根据Hongbo-Miao的建议修正了一些问题 2016-07-14 16:48:52 +08:00
dreamapple 68e7149742 翻译的一点修改: _logger修改为logger 2016-07-14 14:31:17 +08:00
Hongbo Miao 8b4aee3935 Update attribute-directives.jade 2016-07-13 23:32:24 -04:00
Hongbo Miao b4a194634c add lost info back 2016-07-13 23:30:40 -04:00
Zhicheng Wang e2892d1382 纠正一个翻译错误,来自wudingli。 2016-07-14 10:41:54 +08:00
Zhicheng Wang c8ec2db73c 翻译了一个遗漏的新增英文 2016-07-14 10:06:13 +08:00
Zhicheng Wang 3789144368 根据网友pshadow的勘误,改正一个错误 2016-07-14 07:52:12 +08:00
Zhicheng Wang 46ea47d126 添加dialog.service导致了编译错误,修正回去 2016-07-12 13:52:49 +08:00
Thomas Shafer b669e30187 docs(toh-4): change var keyword to const for HEROES constant
closes #1858
HEROES is a `const` and is defined as a `const` originally: https://github.com/angular/angular.io/blob/master/public/docs/_examples/toh-2/ts/app/app.component.ts#L10
2016-07-11 22:07:41 -07:00
Sekib Omazic f15b40f513 fix(package.webpack.json): add angular2-template-loader
closes #1864
Add missing angular2-template-loader dependency
2016-07-11 22:02:20 -07:00
Foxandxss 961f5c8994 chore: make animation test wait a bit longer
closes #1844
2016-07-11 22:00:04 -07:00
Foxandxss 50b51f6bdc docs(router): fix broken links in router chapters
closes #1843
2016-07-11 21:57:15 -07:00
Patrice Chalin 98e5d4af77 docs(all): link cleanup - broken and outdated
closes #1841
Fixes all broken links except genuine errors (see #1840), have been
resolved as of 2016-07-06
(https://github.com/angular/angular/commit/2708ce6a17667a2369c83bcf244c9
366b058d4c9).

Fixes #1574
2016-07-11 21:50:07 -07:00
Brandon Roberts 5104470558 docs(router): Removed refs to deprecated router; lowerCamelCase constants
closes #1834
2016-07-11 21:44:12 -07:00
Patrice Chalin 761f857f13 docs(architecture/dart): proofread, updated Dart/TS app and jade
closes #1807
- e2e tests now also cover the tax calculator.
- Dart app updated to match TS (it had no sales tax calculator).
- TS sample source cleanup (e.g. removed many unnecessary `docregions`).
- Prose updated to include @kwalrath's revisions from a while ago, Ward's comments, and
some of my edits as well.

Contributes to #1598 and #1508.
2016-07-11 20:35:06 -07:00
Patrice Chalin fb9edf972e chore: fix "Invalid example" warnings from shred map builder
closes #1832
The shred map (xref) builder was issuing warnings. This fix includes
- Adjustments to the shredder map builder itself so that it
understands, e.g., app-project relative example paths.
- `**/guide/glossary.jade` now (Jade) `includes` the shared parent
`glossary.jade` rather than (Harp) importing (via `partial`). This
fixes `makeExample` path issues in the glossary.
- Adjusted some `makeExample` paths that were ok for site build, but
confused the xref tool.
2016-07-11 20:10:56 -07:00
Zhicheng Wang 2eb5463384 微调 2016-07-11 13:13:01 +08:00
雪狼 aae9cc20d1 Merge pull request #16 from dreamapplehappy/dreamapple-contribute
翻译的一点建议
2016-07-11 13:11:44 +08:00
Zhicheng Wang f6eba2df5e 根据gogobook的反馈添加了dialog.service
鸣谢里添加了给出反馈的github网友
2016-07-11 13:04:16 +08:00
Zhicheng Wang ac9e032b51 根据 wudingli 的反馈修正了翻译 2016-07-11 12:51:41 +08:00
Zhicheng Wang 210b076594 根据网上反馈去掉了路由名字,新版已经不需要了。 2016-07-11 12:46:21 +08:00
Zhicheng Wang fb60f9c4c5 翻译了一段儿新增内容 2016-07-11 08:37:48 +08:00
Zhicheng Wang 273a0fd1e8 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/guide/webpack.jade
2016-07-11 08:32:56 +08:00
Ward Bell 0664a271ba docs(style-guide): spell const variables in lower camel case
Changes previous guidance on const which insisted on UPPER_SNAKE_CASE
2016-07-07 22:41:04 -07:00