Commit Graph
247 Commits
Author SHA1 Message Date
Zhimin YE fb4aa6a7a0 fix: #97 2016-10-19 11:06:26 +01:00
Zhimin YE 7fc3e00002 fix: #97 2016-10-19 11:05:10 +01:00
Zhimin YE f6d2b39844 fix: toh-pt5 2016-10-18 11:58:43 +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
Rex 606c656f1b fix: #95 2016-10-17 15:22:23 +01:00
Sebastián Ramírez 883a29ecf7 Fix minor typo in HTTP guide (#2604) 2016-10-14 12:35:28 +02:00
Jesús Rodríguez e503efe8c8 docs(toh5): add moduleId information (#2597) 2016-10-13 16:41:57 -07:00
Sebastián Ramírez 4f81a7ee8c docs(toh5): update styles.css link (#2601) 2016-10-14 01:12:06 +02:00
Ward Bell 2e17d587de docs(toh-5): add AppRoutingModule (#2584) 2016-10-11 16:30:30 -07:00
SangKa 2751b20aae 修正 教程 7.Http 翻译问题 2016-10-10 06:53:40 +08: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
Zhimin YE (Rex) b6ff278ac5 fix: #86 2016-10-03 10:26:22 +01:00
Zhimin YE (Rex) 1523fedcf0 Merge remote-tracking branch 'origin/master' 2016-09-26 15:15:09 +01:00
Zhimin YE (Rex) a18aa9ec01 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	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/index.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-09-26 15:14:39 +01:00
zhibinr 47b3b3dbba 修复格式错误 2016-09-26 11:13:10 +08:00
Brandon 556e40695a docs(toh): Replaced window.history with location service (#2439) 2016-09-25 18:56:12 -07:00
Ward Bell 6def9505cc chore: convert templateUrls to use moduleId where possible. (#2477) 2016-09-25 18:51:54 -07:00
rexebin f7c60a07df fix: change all 他 > 它 2016-09-25 19:50:45 +01:00
rexebin d9af771f8d Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	README.md
#	public/contribute.jade
#	public/docs/_includes/_side-nav.jade
#	public/docs/_includes/_ts-temp.jade
#	public/docs/index.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/component-relative-paths.jade
#	public/docs/ts/latest/cookbook/index.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/cookbook/visual-studio-2015.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/animations.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/pipes.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/typescript-configuration.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/index.jade
#	public/support.jade
2016-09-23 22:13:02 +01:00
Patrice Chalin b2c6acf1ad docs(tutorial): fix broken link (#2420)
Fixes #2419
2016-09-20 10:56:38 -07:00
Jesús Rodríguez 693f6ae462 chore: rename Angular 2 to simply Angular (#2402) 2016-09-19 20:24:40 -07:00
Patrice Chalin e016f3f31e docs(tutorial): don't use shredder for intro page (#2388)
An initial multilang cleanup for ng2.io
2016-09-19 16:56:17 -07:00
Zhimin YE (Rex) 054d25cefe fix: toh-pt6 and embeded live example in ngmodule. 2016-09-19 14:48:05 +01:00
Zhimin YE (Rex) 6aeb8efaa3 fix: live example localisation. 2016-09-19 10:03:53 +01:00
Zhimin YE (Rex) 94d48f2b95 fix: toh1 and 2 2016-09-19 10:00:09 +01:00
John Papa 159b196baf docs(toh): fix spelling of ActivateRoute to ActivatedRoute (#2400)
* fixed spelling of ActivateRoute to ActivatedRoute

* dont do cache
2016-09-18 18:34:32 +02:00
Zhicheng Wang 6f6f89ed9c 把所有“内建”改为“内置” 2016-09-17 11:46:17 +08:00
Zhicheng Wang e693d35fb1 合并了最新更新,翻译了官方的发布声明 2016-09-15 17:08:17 +08:00
Zhicheng Wang 2a1c3626c5 去掉了大部分儿化音
感谢来自github的iloveyo123u1和Elderry
2016-09-12 08:35:02 +08:00
Zhicheng Wang 1a45c1f8fc 更正中文社区的阿泽指出的错误 2016-09-11 09:35:54 +08:00