944 Commits

Author SHA1 Message Date
Zhimin YE
fb75d67052 review testing line 3480 2016-10-25 16:50:10 +01:00
Zhimin YE
7893c42b53 review: testin 3463 2016-10-25 16:49:13 +01:00
Zhimin YE
0957c70caf review testing 3239 2016-10-25 16:38:16 +01:00
Zhimin YE
de8efbaf4e review testing. 2016-10-25 16:14:07 +01:00
Zhimin YE
e139832320 review testing 2016-10-25 16:08:31 +01:00
Zhimin YE
7b7487902c review: testing 2016-10-25 15:32:47 +01:00
Zhimin YE
d84a1b95dd review testing 2016-10-25 15:32:30 +01:00
Zhimin YE
c0cabddd69 fix: routing 2016-10-25 13:09:12 +01:00
Zhimin YE
79e5dcc3c3 Merge branch 'master' of https://github.com/angular/angular-cn 2016-10-25 12:52:56 +01:00
Zhimin YE
ee9bae0112 review testing 2016-10-25 12:52:44 +01:00
Rex
f64cf9c70a Merge pull request #103 from Hongbo-Miao/patch-3
fix translation mistake
2016-10-25 12:52:20 +01:00
Zhimin YE
ac674f009b review: testing 2750 2016-10-25 10:35:58 +01:00
Zhimin YE
a4d66dfc07 review testing 2644 2016-10-25 10:26:30 +01:00
Zhimin YE
f6598097c8 Merge branch 'master' of https://github.com/angular/angular-cn 2016-10-25 10:12:31 +01:00
Zhimin YE
860334177b review tesing 2016-10-25 10:12:28 +01:00
Hongbo Miao
60101cc797 fix translation mistake 2016-10-24 22:24:15 -04:00
Hongbo Miao
804206ca87 fix translation mistake 2016-10-24 20:04:47 -04:00
rexebin
50ad8c189a review: to line 2494 2016-10-24 22:32:17 +01:00
rexebin
aa2d4e629f review: testing. 2016-10-24 22:20:42 +01:00
rexebin
f500220488 fix: testing 2016-10-24 21:43:04 +01:00
rexebin
368193ba34 fix: testing.jade table. 2016-10-24 21:00:17 +01:00
Zhimin YE
3de420bf48 review 2016-10-24 15:03:23 +01:00
Zhimin YE
8aa8c11697 review: tesing. 2016-10-24 14:55:43 +01:00
Zhimin YE
3697cedeaa review: 一些测试->测试程序 2016-10-24 12:58:39 +01:00
Zhimin YE
92b666658c Merge branch 'master' of https://github.com/angular/angular-cn 2016-10-24 12:10:56 +01:00
Zhimin YE
865a0934bd review: testing.jade 2016-10-24 12:10:45 +01:00
yinyong02
3575677f5a Fixed typo 2016-10-24 09:35:09 +08: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