Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							d7fd581c37 
							
						 
					 
					
						
						
							
							Merge branch 'master' into aio  
						
						... 
						
						
						
						# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/resources.json
#	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 
						
						
					 
					
						2017-10-01 13:22:33 +08:00 
						 
				 
			
				
					
						
							
							
								Kapunahele Wong 
							
						 
					 
					
						
						
						
						
							
						
						
							48c6ece2be 
							
						 
					 
					
						
						
							
							docs(aio): remove links to top of documents ( #16971 )  
						
						
						
						
					 
					
						2017-09-27 13:45:25 -07: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 
							
						 
					 
					
						
						
						
						
							
						
						
							41c73556e6 
							
						 
					 
					
						
						
							
							fix: minor improvement  
						
						
						
						
					 
					
						2017-08-04 13:27:54 +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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Jesus Rodriguez 
							
						 
					 
					
						
						
						
						
							
						
						
							56833a6171 
							
						 
					 
					
						
						
							
							docs(aio): more content fixes  
						
						
						
						
					 
					
						2017-05-10 12:51:01 +01: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 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							93516ea8a1 
							
						 
					 
					
						
						
							
							docs(aio): rename cb- files and a few others  
						
						
						
						
					 
					
						2017-04-24 14:00:51 +01: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 
						 
				 
			
				
					
						
							
							
								Peter Bacon Darwin 
							
						 
					 
					
						
						
						
						
							
						
						
							ab40fcb068 
							
						 
					 
					
						
						
							
							docs(aio): fix relative links  
						
						... 
						
						
						
						The migrator was updated to automatically fix these links.
See fca5fb02803927b7a038 
						
						
					 
					
						2017-03-13 16:56:23 -07:00 
						 
				 
			
				
					
						
							
							
								Peter Bacon Darwin 
							
						 
					 
					
						
						
						
						
							
						
						
							1847550ad1 
							
						 
					 
					
						
						
							
							docs(aio): move cookbooks into guide  
						
						... 
						
						
						
						Also update all docs with migrated versions from latest angular.io
Fixes  #14941  
						
						
					 
					
						2017-03-13 16:56:23 -07:00