918 Commits

Author SHA1 Message Date
Zhimin YE
865a0934bd review: testing.jade 2016-10-24 12:10:45 +01:00
Zhimin YE
03cb1c5689 translate: change-log done 2016-10-20 11:50:10 +01:00
leiermeng
63bac4eba5 fix: guide/router some error 2016-10-20 14:50:54 +08:00
rexebin
f8b80ad3e5 translate: testing is done. 2016-10-18 21:48:48 +01:00
SangKa
5774909946 (测试一章):修复错别字 2016-10-18 22:05:23 +08:00
SangKa
232196e6b2 (测试一章):文字优化 消除歧义 2016-10-18 22:04:52 +08:00
Zhimin YE
0741e1f058 fix: upgrade example 2016-10-18 15:00:32 +01:00
Zhimin YE
abb21017c2 Merge branch 'master' of https://github.com/angular/angular-cn 2016-10-18 14:58:02 +01:00
Zhimin YE
183633b0e3 fix: router and testing 2016-10-18 14:57:39 +01:00
Zhicheng Wang
afd557b887 文字微调 2016-10-18 20:38:38 +08:00
Zhicheng Wang
33249c9de3 文字微调 2016-10-18 20:34:51 +08:00
Zhicheng Wang
1c13200b98 文字微调 2016-10-18 20:28:42 +08:00
Zhimin YE
17ef4622e7 fix: attribute-directives. 2016-10-18 12:10:12 +01:00
Zhimin YE
b7d99121e7 fix: _data.json 2016-10-18 11:03:18 +01:00
Zhimin YE
9cdc23c0f7 fix: forms, style guide and template syntax 2016-10-18 10:47:45 +01:00
rexebin
ef1eb67ceb Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	harp.json
#	public/_includes/_hero-home.jade
#	public/_includes/_scripts-include.jade
#	public/docs/_examples/quickstart/js/package.1.json
#	public/docs/_includes/_side-nav.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/api/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/ngmodule-faq.jade
#	public/docs/ts/latest/cookbook/rc4-to-rc5.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/ngmodule.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/upgrade.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/_data.json
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-10-17 22:48:30 +01:00
rexebin
ce3930b2c0 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	harp.json
#	public/_includes/_hero-home.jade
#	public/_includes/_scripts-include.jade
#	public/docs/_examples/quickstart/js/package.1.json
#	public/docs/_includes/_side-nav.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/api/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/ngmodule-faq.jade
#	public/docs/ts/latest/cookbook/rc4-to-rc5.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/ngmodule.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/upgrade.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/_data.json
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-10-17 22:48:18 +01:00
Ward Bell
94b8793d70 docs(template-syntax): correct ref var scope per #2458 (#2602)
closes #2458
2016-10-13 16:26:41 -07:00
Kapunahele Wong
f49633a62c docs(attribute directives): copy edits squashed (#2508) 2016-10-13 15:42:23 -07:00
Ward Bell
0f9a00f144 docs(changelog): fix title in v.2.1.0 announcement (#2591) 2016-10-12 15:32:12 -07:00
Ward Bell
7b509de819 docs(changelog): in-sync with Ng v.2.1.0 (#2590) 2016-10-12 15:29:28 -07:00
Torgeir Helgevold
cdfe957ab8 docs(toh-6-aot): add aot to toh-6 (#2496)
* docs(toh-6-aot): add aot to toh-6

s

s

s

s

s

* docs(toh-6-aot): add aot to toh-6

* docs(toh-6-aot): make aot e2e tests run in the same project
Updates tooling for this purpose and also the prose.
2016-10-12 01:44:49 -07:00
Zhicheng Wang
7aa3c2320a 把立即加载统一改为主动加载 2016-10-12 15:23:34 +08:00
Zhicheng Wang
72b0ec623e lazy-loading统一翻译为惰性加载 2016-10-11 16:26:41 +08:00
Zhicheng Wang
557029074f 修正了遗漏的翻译 2016-10-11 16:26:41 +08:00
Ward Bell
61b13c13ec chore: v.2.0.2 + standard MIT licenses property (#2559) 2016-10-06 17:21:05 -07:00
Ward Bell
ec1c8281e2 docs(change-log): add documentation change log 2016-10-06 13:21:31 -07:00
Zhicheng Wang
e1fd53b9b3 更正individual的翻译 2016-10-06 20:48:24 +08:00
Zhicheng Wang
41b0cc800b 更正了technically的翻译 2016-10-06 20:37:42 +08:00
Zhicheng Wang
78418f4d3c 调整additional的翻译 2016-10-06 19:38:32 +08:00
Matthew Hegarty
eff7e04ac3 Router typos (#2523)
* Fixed typo which was referring to 'imports' section and not 'setup' section

* Fixed 1 char typo: /he *Cancel/the *Cancel/

* Fixed broken link: router.html#optional-route-parameter (added an 's' to 'parameter')

* corrected grammar: /affords/afford/

* Fixed typo: /moved them/move them/
2016-10-05 16:15:42 -07:00
Brandon
ff118810ff docs(router): Updated routing examples to use routing modules (#2478)
Simplified routing in tutorial example

Updated ngmodule guide and ngmodule faq with routing module prose
2016-10-05 14:59:09 -07:00
Rex
020722e3ea translate: 3450 2016-10-05 21:44:04 +01:00
Rex
08ef04a968 fix: override 2016-10-05 20:54:19 +01:00
Zhimin YE (Rex)
7350ac0e1f fix: #87 2016-10-04 11:09:40 +01:00
Zhimin YE (Rex)
865383612d fix: #87 2016-10-04 11:08:53 +01:00
Ward Bell
bf97a9a2e1 docs(style-guide): fix folder structure in 04 to match what we do. (#2535)
closes issue #2533
2016-10-03 18:16:15 -07:00
Rex
ad01e61fb3 translate: testing.jade to line 3266 2016-10-02 22:13:04 +01:00
Zhicheng Wang
032ac9c337 typo 2016-10-02 16:43:49 +08:00
Zhicheng Wang
dca47cbb1a Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/_examples/quickstart/ts/package.1.json
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/upgrade.jade
2016-10-02 10:39:25 +08:00
Ward Bell
56ac24b411 chore: fix broken links on 9/30, mostly API links (#2520) 2016-10-01 07:11:21 -07:00
Alireza Mirian
7796f485fd fix(guide/form): fix a broken link (#2498) 2016-09-30 23:33:26 +02:00
Jonas Felix
c548f9700b docs(style-guide): add missing word in bootstrapping remark (#2512) 2016-09-30 23:30:20 +02:00
Chase
98d438ed9b docs(testing): delete extra 'with' (#2513)
Deleted extra 'with'
2016-09-30 23:29:49 +02:00
Chase
1591bcc0e1 docs(testing): fix link (#2514)
Fixed link
2016-09-30 23:29:16 +02:00
Chase
4f9f51cb4b Fixed minor typos in testing (#2515)
Fixed minor typos in testing
2016-09-30 23:28:45 +02:00
Zhicheng Wang
54d1be2e5a 把angular2-in-memory-web-api改名为angular-in-memory-web-api
#84
2016-09-30 21:38:44 +08:00
Ward Bell
e6199a8dfb docs(i18n): add internationalization (i18n) guide (#2491)
* docs(i18n): add internationalization (i18n) guide

* docs(cb-i18n): revamped to System.import the translation file
2016-09-29 11:15:55 -07:00
Cody Lundquist
480a824214 docs(style-guide): Fix a couple typos
closes #2489
2016-09-27 12:03:42 -07:00
guichi
ba5e194acd Update router.jade
改正错误
2016-09-27 16:25:02 +08:00