Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							6b1d4a4890 
							
						 
					 
					
						
						
							
							fix: HttpModule => HttpClientModule  
						
						
						
						
					 
					
						2018-02-28 13:22:43 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							c08a3830df 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'en/master' into aio  
						
						... 
						
						
						
						# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/change-log.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/deployment.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/http.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule.md
#	aio/content/guide/pipes.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/security.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/testing.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/upgrade.md
#	aio/content/marketing/docs.md
#	aio/content/marketing/features.html
#	aio/content/marketing/resources.json
#	aio/content/navigation.json
#	aio/src/app/layout/doc-viewer/doc-viewer.component.ts 
						
						
					 
					
						2018-02-28 13:13:29 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							1531b0610d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'en/master' into aio  
						
						... 
						
						
						
						# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/http.md
#	aio/content/guide/i18n.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/pipes.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/index.html
#	aio/content/navigation.json
#	aio/content/tutorial/index.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/src/app/embedded/api/api-list.component.ts
#	aio/src/app/layout/doc-viewer/doc-viewer.component.ts
#	aio/src/app/layout/footer/footer.component.html
#	aio/src/app/layout/toc/toc.component.html
#	aio/src/app/search/search.service.ts
#	aio/src/styles/1-layouts/_marketing-layout.scss
#	aio/yarn.lock 
						
						
					 
					
						2018-02-28 08:08:59 +08:00 
						 
				 
			
				
					
						
							
							
								Eli Sadoff 
							
						 
					 
					
						
						
						
						
							
						
						
							6e8bc310f0 
							
						 
					 
					
						
						
							
							docs: change ”it's" to "its" as needed in several docs. ( #21867 )  
						
						... 
						
						
						
						Most of them are in content but one is in common and needs special approval.
PR Close  #21867  
						
						
					 
					
						2018-01-29 11:34:46 -08:00 
						 
				 
			
				
					
						
							
							
								George Kalpakas 
							
						 
					 
					
						
						
						
						
							
						
						
							81e87095b4 
							
						 
					 
					
						
						
							
							docs: several minor NgModule guide fixes/improvements ( #21589 )  
						
						... 
						
						
						
						PR Close  #21589  
						
						
					 
					
						2018-01-18 18:22:20 -06:00 
						 
				 
			
				
					
						
							
							
								Kapunahele Wong 
							
						 
					 
					
						
						
						
						
							
						
						
							af2a843446 
							
						 
					 
					
						
						
							
							docs: edit entry component FAQ ( #21487 )  
						
						... 
						
						
						
						PR Close  #21487  
						
						
					 
					
						2018-01-17 17:14:33 -08:00 
						 
				 
			
				
					
						
							
							
								Kapunahele Wong 
							
						 
					 
					
						
						
						
						
							
						
						
							02377335ec 
							
						 
					 
					
						
						
							
							docs: add server side redirect and fix NgModule FAQ links ( #21487 )  
						
						... 
						
						
						
						PR Close  #21487  
						
						
					 
					
						2018-01-17 17:14:33 -08:00 
						 
				 
			
				
					
						
							
							
								Kapunahele Wong 
							
						 
					 
					
						
						
						
						
							
						
						
							53f91189a1 
							
						 
					 
					
						
						
							
							docs(aio): add NgModule docs ( #20306 )  
						
						... 
						
						
						
						PR Close  #20306  
						
						
					 
					
						2018-01-10 16:26:46 -08:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							816d5ba3fd 
							
						 
					 
					
						
						
							
							docs: NgModule guide prose for CLI (partial) ( #19776 )  
						
						... 
						
						
						
						Also replaces “Angular Module” with “NgModule” wherever that is clarifying.
Continue using “module” when qualified as in “feature module”, “root module”, “routing module”, etc.
PR Close  #19776  
						
						
					 
					
						2017-11-20 18:39:25 -06:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							c4e7f3fe0a 
							
						 
					 
					
						
						
							
							fix: typo  
						
						
						
						
					 
					
						2017-09-07 07:25:20 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							0eaf9156de 
							
						 
					 
					
						
						
							
							fix: use new translation logic  
						
						
						
						
					 
					
						2017-08-06 13:37:25 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							3a584ba96c 
							
						 
					 
					
						
						
							
							fix: some untranslated english  
						
						
						
						
					 
					
						2017-08-06 13:21:34 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							0ddf72745e 
							
						 
					 
					
						
						
							
							fix: translate all pure english titles  
						
						
						
						
					 
					
						2017-08-04 14:06:15 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							c002fddabe 
							
						 
					 
					
						
						
							
							fix: many of broken links  
						
						
						
						
					 
					
						2017-07-30 12:32:56 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							f2059b445c 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'en/master' into aio  
						
						... 
						
						
						
						# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/architecture.md
#	aio/content/guide/attribute-directives.md
#	aio/content/guide/bootstrapping.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/cb-index.md
#	aio/content/guide/change-log.md
#	aio/content/guide/cheatsheet.md
#	aio/content/guide/cli-quickstart.md
#	aio/content/guide/component-interaction.md
#	aio/content/guide/component-styles.md
#	aio/content/guide/dependency-injection-in-action.md
#	aio/content/guide/dependency-injection.md
#	aio/content/guide/deployment.md
#	aio/content/guide/displaying-data.md
#	aio/content/guide/dynamic-component-loader.md
#	aio/content/guide/dynamic-form.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/forms.md
#	aio/content/guide/glossary.md
#	aio/content/guide/hierarchical-dependency-injection.md
#	aio/content/guide/i18n.md
#	aio/content/guide/index.md
#	aio/content/guide/learning-angular.md
#	aio/content/guide/lifecycle-hooks.md
#	aio/content/guide/ngmodule-faq.md
#	aio/content/guide/ngmodule.md
#	aio/content/guide/npm-packages.md
#	aio/content/guide/pipes.md
#	aio/content/guide/quickstart.md
#	aio/content/guide/reactive-forms.md
#	aio/content/guide/router.md
#	aio/content/guide/security.md
#	aio/content/guide/server-communication.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/setup-systemjs-anatomy.md
#	aio/content/guide/setup.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/styleguide.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/guide/ts-to-js.md
#	aio/content/guide/typescript-configuration.md
#	aio/content/guide/upgrade.md
#	aio/content/guide/user-input.md
#	aio/content/guide/visual-studio-2015.md
#	aio/content/guide/webpack.md
#	aio/content/navigation.json
#	aio/content/tutorial/index.md
#	aio/content/tutorial/toh-pt1.md
#	aio/content/tutorial/toh-pt2.md
#	aio/content/tutorial/toh-pt3.md
#	aio/content/tutorial/toh-pt4.md
#	aio/content/tutorial/toh-pt5.md
#	aio/content/tutorial/toh-pt6.md
#	aio/package.json
#	aio/src/styles/main.scss
#	aio/transforms/angular.io-package/index.js 
						
						
					 
					
						2017-07-30 00:09:50 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							20a55c54ed 
							
						 
					 
					
						
						
							
							docs(aio): merge latest chinese translations  
						
						
						
						
					 
					
						2017-07-23 11:51:25 +08:00 
						 
				 
			
				
					
						
							
							
								Thanesh Rajandran 
							
						 
					 
					
						
						
						
						
							
						
						
							410f21c75c 
							
						 
					 
					
						
						
							
							docs(aio): fix typo in NgModule FAQs ( #18211 )  
						
						... 
						
						
						
						Fix  #18133 . Fix typo 'added' to 'add' in the 'Why does lazy loading create a child injector' section. 
					
						2017-07-20 09:07:30 -07:00 
						 
				 
			
				
					
						
							
							
								Kapunahele Wong 
							
						 
					 
					
						
						
						
						
							
						
						
							e110a80caf 
							
						 
					 
					
						
						
							
							docs(aio): change Angular Module to NgModule ( #16964 )  
						
						
						
						
					 
					
						2017-07-11 15:05:20 -07:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							cd5bc64658 
							
						 
					 
					
						
						
							
							docs(aio): update headers for toc ( #16969 )  
						
						
						
						
					 
					
						2017-05-26 13:28:06 -06:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							03610526e5 
							
						 
					 
					
						
						
							
							docs(aio): remove hardcoded TOC  
						
						
						
						
					 
					
						2017-05-04 15:51:37 -07:00 
						 
				 
			
				
					
						
							
							
								Jesus Rodriguez 
							
						 
					 
					
						
						
						
						
							
						
						
							ff32c53099 
							
						 
					 
					
						
						
							
							docs(aio): fix lots of broken links  
						
						... 
						
						
						
						Closes  #16317  
					
						2017-05-01 15:51:26 -07:00 
						 
				 
			
				
					
						
							
							
								Peter Bacon Darwin 
							
						 
					 
					
						
						
						
						
							
						
						
							df619adc76 
							
						 
					 
					
						
						
							
							docs(aio): update to remark syntax  
						
						
						
						
					 
					
						2017-04-12 12:24:02 -07:00 
						 
				 
			
				
					
						
							
							
								Jesus Rodriguez 
							
						 
					 
					
						
						
						
						
							
						
						
							0e38bf9de0 
							
						 
					 
					
						
						
							
							build(aio): new migration  
						
						
						
						
					 
					
						2017-04-03 15:41:05 -07:00 
						 
				 
			
				
					
						
							
							
								Peter Bacon Darwin 
							
						 
					 
					
						
						
						
						
							
						
						
							46f8a6dd85 
							
						 
					 
					
						
						
							
							docs(aio): remove unnecessary blank lines  
						
						
						
						
					 
					
						2017-03-31 16:22:08 +01:00 
						 
				 
			
				
					
						
							
							
								Peter Bacon Darwin 
							
						 
					 
					
						
						
						
						
							
						
						
							2d14c3b17a 
							
						 
					 
					
						
						
							
							docs(aio): ensure blank lines before HTML blocks in markdown  
						
						
						
						
					 
					
						2017-03-31 08:05:33 +01:00 
						 
				 
			
				
					
						
							
							
								Peter Bacon Darwin 
							
						 
					 
					
						
						
						
						
							
						
						
							fd72fad8fd 
							
						 
					 
					
						
						
							
							docs(aio): update migrated content from anguar.io  
						
						
						
						
					 
					
						2017-03-28 10:21:46 +01:00