Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							89060a39df 
							
						 
					 
					
						
						
							
							fix: 不正常的中英文段落合并  
						
						
						
						
					 
					
						2018-02-28 13:44:53 +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 
						 
				 
			
				
					
						
							
							
								Kapunahele Wong 
							
						 
					 
					
						
						
						
						
							
						
						
							3a0b5a928c 
							
						 
					 
					
						
						
							
							docs(aio): fix extraneous divs ( #22069 )  
						
						... 
						
						
						
						PR Close  #22069  
						
						
					 
					
						2018-02-14 15:02:36 -05:00 
						 
				 
			
				
					
						
							
							
								Denny Brown 
							
						 
					 
					
						
						
						
						
							
						
						
							8c51c276c7 
							
						 
					 
					
						
						
							
							docs: fix stray div and reformat paragraph ( #21676 )  
						
						... 
						
						
						
						PR Close  #21676  
						
						
					 
					
						2018-01-19 20:40:13 -08:00 
						 
				 
			
				
					
						
							
							
								Kapunahele Wong 
							
						 
					 
					
						
						
						
						
							
						
						
							53f91189a1 
							
						 
					 
					
						
						
							
							docs(aio): add NgModule docs ( #20306 )  
						
						... 
						
						
						
						PR Close  #20306  
						
						
					 
					
						2018-01-10 16:26:46 -08:00 
						 
				 
			
				
					
						
							
							
								Jesus Rodriguez 
							
						 
					 
					
						
						
						
						
							
						
						
							89187d9b6b 
							
						 
					 
					
						
						
							
							docs(aio): update glossary for CLI ( #20017 )  
						
						... 
						
						
						
						PR Close  #20017  
						
						
					 
					
						2017-11-14 10:00:10 -08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							de6cfeeee3 
							
						 
					 
					
						
						
							
							clean: remove useless codes  
						
						
						
						
					 
					
						2017-08-06 13:42:51 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							4c2b0b51b7 
							
						 
					 
					
						
						
							
							fix: some untranslated english  
						
						
						
						
					 
					
						2017-08-06 13:23:56 +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 
						 
				 
			
				
					
						
							
							
								Kapunahele Wong 
							
						 
					 
					
						
						
						
						
							
						
						
							e110a80caf 
							
						 
					 
					
						
						
							
							docs(aio): change Angular Module to NgModule ( #16964 )  
						
						
						
						
					 
					
						2017-07-11 15:05:20 -07:00 
						 
				 
			
				
					
						
							
							
								Trotyl Yu 
							
						 
					 
					
						
						
						
						
							
						
						
							bbf2133fa9 
							
						 
					 
					
						
						
							
							docs: update ECMAScript info ( #17801 )  
						
						
						
						
					 
					
						2017-07-11 12:44:56 -07:00 
						 
				 
			
				
					
						
							
							
								Stefanie Fluin 
							
						 
					 
					
						
						
						
						
							
						
						
							4d2ee51bb0 
							
						 
					 
					
						
						
							
							fix(aio): remove glossary l-sub-section class ( #17305 )  
						
						
						
						
					 
					
						2017-06-08 11:58:49 -07:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							cd5bc64658 
							
						 
					 
					
						
						
							
							docs(aio): update headers for toc ( #16969 )  
						
						
						
						
					 
					
						2017-05-26 13:28:06 -06:00 
						 
				 
			
				
					
						
							
							
								aravindfz 
							
						 
					 
					
						
						
						
						
							
						
						
							c8dc116951 
							
						 
					 
					
						
						
							
							docs(aio): fixing new url on glossary date pipe  
						
						
						
						
					 
					
						2017-05-03 13:29:04 -07:00 
						 
				 
			
				
					
						
							
							
								Jesus Rodriguez 
							
						 
					 
					
						
						
						
						
							
						
						
							ff32c53099 
							
						 
					 
					
						
						
							
							docs(aio): fix lots of broken links  
						
						... 
						
						
						
						Closes  #16317  
					
						2017-05-01 15:51:26 -07:00 
						 
				 
			
				
					
						
							
							
								Chris McKnight 
							
						 
					 
					
						
						
						
						
							
						
						
							feda017c50 
							
						 
					 
					
						
						
							
							docs(aio): Fix decorator JS feature explanation ( #16214 )  
						
						
						
						
					 
					
						2017-04-24 09:54:36 -07:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							5461182e25 
							
						 
					 
					
						
						
							
							docs(aio): make glossary links work again ( #16201 )  
						
						
						
						
					 
					
						2017-04-20 20:11:27 -07:00 
						 
				 
			
				
					
						
							
							
								Stefanie Fluin 
							
						 
					 
					
						
						
						
						
							
						
						
							e9db74f937 
							
						 
					 
					
						
						
							
							fix(aio): style mods and content udpates ( #16138 )  
						
						... 
						
						
						
						Fixed capitalization in sidenav menu items
Add min height property to sidenav-content for better viewing on short pages or high resolution screens
Add dividier between change log items as before to h2
Table adjustments to reduce off-screen items
Update home page banner text and icon change, and fix banner img and mobile alignment
Fix and add links in doc landing page and change card footer text to reflect correct name
Removed docs landing page to rebase with master
PR Close  #16138  
						
						
					 
					
						2017-04-19 22:35:12 -05: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 
							
						 
					 
					
						
						
						
						
							
						
						
							d8c35c893b 
							
						 
					 
					
						
						
							
							docs(aio): move quickstarts and glossary into guide  
						
						
						
						
					 
					
						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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Peter Bacon Darwin 
							
						 
					 
					
						
						
						
						
							
						
						
							3e34ba01bd 
							
						 
					 
					
						
						
							
							docs(aio): migrate content docs from angular.io  
						
						... 
						
						
						
						This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator  
						
						
					 
					
						2017-02-23 23:23:58 -08:00