2061 Commits

Author SHA1 Message Date
Zhicheng Wang
7c2da09b21 语言微调 2016-07-18 14:30:01 +08:00
Zhicheng Wang
e140256358 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
2016-07-17 20:40:12 +08:00
Torgeir Helgevold
a19c2ce726 docs(toh-6): use consistent header syntax
closes #1903
2016-07-16 19:10:41 -07:00
Zhicheng Wang
1d107eafb3 翻译了一些合并时遗漏的内容 2016-07-16 18:29:42 +08:00
Zhicheng Wang
3e9394f62a 校对合并结果 2016-07-16 17:47:55 +08:00
vikerman
6bf6741bcb chore(bios): Added bio for Vikram Subramanian (#1891) 2016-07-15 15:34:05 -07:00
Patrice Chalin
1bef20abc4 docs(api/dart): add support for generation and display (#1888)
Fixes #1880.
Supersedes #1593.
2016-07-15 14:10:12 -07:00
Zhimin YE (Rex)
82c7f49784 review: toh-pt5.jade 2016-07-15 17:30:05 +01:00
Zhimin YE (Rex)
b2bd58c675 review of architecture.jade. 2016-07-15 17:11:25 +01:00
Jesús Rodríguez
d7ece5f4b7 chore: hide the english toggle link until angular is loaded 2016-07-15 17:58:01 +02: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
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
雪狼
31500f1006 Merge pull request #28 from Hongbo-Miao/patch-1
add lost @Component back
2016-07-14 16:07:17 +08:00
dreamapple
68e7149742 翻译的一点修改: _logger修改为logger 2016-07-14 14:31:17 +08:00
Zhicheng Wang
438a15abe3 增加中文社区三群 2016-07-14 11:42:23 +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
bc06443bb6 在中英文之间添加了一些空格 2016-07-13 13:28:10 +08:00
Zhicheng Wang
5cf04ba3ec 在中英文之间添加了一些空格 2016-07-13 13:27:52 +08:00
Zhicheng Wang
c50faffd97 添加了一些空格 2016-07-13 13:16:41 +08:00
Naomi Black
5da6dff3ec launch(chinese): update the banner translation 2016-07-11 23:03:01 -07:00
Naomi Black
9aa664a49d chore(news): add link to china blog announcment 2016-07-11 22:54:00 -07:00
Zhicheng Wang
46ea47d126 添加dialog.service导致了编译错误,修正回去 2016-07-12 13:52:49 +08:00
Naomi Black
be23e90095 launch(china): announce angular.cn 2016-07-11 22:45:23 -07: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
Zhicheng Wang
47eb31ddb2 移除banner中的切换中英文提示 2016-07-12 13:05:48 +08: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
Zhimin YE (Rex)
01dc30eb3e chore: Change toggle button text to English.
Add "Click to show/hide English" to home.
2016-07-08 09:47:55 +01: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