| 
							
							
								 Zhimin YE | b82cf0de4c | fix: ngmodule-faq | 2016-10-18 22:16:04 +01:00 |  | 
			
				
					| 
							
							
								 rexebin | 7a894d6434 | patch up: ngmodule-faq | 2016-10-18 19:44:54 +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 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 7aa3c2320a | 把立即加载统一改为主动加载 | 2016-10-12 15:23:34 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 72b0ec623e | lazy-loading统一翻译为惰性加载 | 2016-10-11 16:26:41 +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 |  | 
			
				
					| 
							
							
								 rexebin | f7c60a07df | fix: change all 他 > 它 | 2016-09-25 19:50:45 +01:00 |  | 
			
				
					| 
							
							
								 rexebin | de6b8d6ad0 | review: ngmodule-faq, done. | 2016-09-18 22:32:25 +01:00 |  | 
			
				
					| 
							
							
								 rexebin | 3f9144eec2 | review: ngmodule-faq: line 980 | 2016-09-18 17:10:44 +01:00 |  | 
			
				
					| 
							
							
								 rexebin | d45052ab8c | review: ngmodule-faq to line 153 | 2016-09-17 20:26:51 +01:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 50f73986be | 翻译完了NgModule FAQ 少量错别字修改 | 2016-09-17 11:45:56 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 0db676a23c | 翻译了一部分NgModule FAQ | 2016-09-16 20:45:50 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | e693d35fb1 | 合并了最新更新,翻译了官方的发布声明 | 2016-09-15 17:08:17 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 2417245114 | Merge remote-tracking branch 'origin/master' # Conflicts:
#	public/_data.json
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/_includes/_hero.jade
#	public/_includes/_main-nav.jade
#	public/_includes/_util-fns.jade
#	public/docs/_includes/_side-nav.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/animations.jade
#	public/docs/ts/latest/guide/ngmodule.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/testing/_data.json
#	public/docs/ts/latest/testing/application-under-test.jade
#	public/docs/ts/latest/testing/first-app-tests.jade
#	public/docs/ts/latest/testing/index.jade
#	public/docs/ts/latest/testing/jasmine-testing-101.jade
#	public/docs/ts/latest/testing/testing-an-angular-pipe.jade
#	public/index.jade
#	public/resources/css/main.scss
#	public/resources/css/module/_side-nav.scss | 2016-09-15 15:23:48 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 551f3dd51a | 更新了cheatsheet 翻译了一部分FAQ | 2016-09-14 21:12:14 +08:00 |  | 
			
				
					| 
							
							
								 Ward Bell | c5ad38ee86 | docs(ngmodule-faq): eager loaded Routed Feature Module must be imported (#2304) fixes #2298 | 2016-09-13 12:27:27 -07:00 |  | 
			
				
					| 
							
							
								 Jesús Rodríguez | 98e5bc248e | docs(ngmodule-faq): fix plunker link (#2277) | 2016-09-13 12:27:13 -07:00 |  | 
			
				
					| 
							
							
								 jmcgoldrick | e1b2f6a2fe | docs(ngmodule-faq): correct BrowserModuleimport module (#2269) | 2016-09-13 12:24:59 -07:00 |  | 
			
				
					| 
							
							
								 Ward Bell | 38bef16604 | docs(ngmodule-faq): stronger, clearer advice on where to register providers (#2262) | 2016-09-03 13:26:19 -07:00 |  | 
			
				
					| 
							
							
								 Ward Bell | 8e15829189 | docs(ngmodule): fixes for defects discovered by John Papa (#2197) includes splitting FAQs into its own cookbook. | 2016-08-25 19:12:15 -07:00 |  |