Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							cacdf7b564 
							
						 
					 
					
						
						
							
							fix: 修正多行合并到一起的错误  
						
						
						
						
					 
					
						2018-02-28 13:20:10 +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 
						 
				 
			
				
					
						
							
							
								Pete Bacon Darwin 
							
						 
					 
					
						
						
						
						
							
						
						
							23596b3f30 
							
						 
					 
					
						
						
							
							docs(aio): fix missing stylesheet in component-styles example ( #21772 )  
						
						... 
						
						
						
						The code in the example was referring to `hero-app.component.css` but this did
not exist.
PR Close  #21772  
						
						
					 
					
						2018-01-25 13:38:12 -08:00 
						 
				 
			
				
					
						
							
							
								Jesus Rodriguez 
							
						 
					 
					
						
						
						
						
							
						
						
							1a75934cc0 
							
						 
					 
					
						
						
							
							build(aio): migrate plunker to stackblitz ( #20165 )  
						
						... 
						
						
						
						PR Close  #20165  
						
						
					 
					
						2018-01-23 21:30:27 -08:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							5e25d3986d 
							
						 
					 
					
						
						
							
							docs: component-styles guide - inline styles must be CSS ( #20701 )  
						
						... 
						
						
						
						Cannot write them in less, sass, or stylus
See CLI issue https://github.com/angular/angular-cli/issues/8472 
PR Close  #20701  
						
						
					 
					
						2017-12-05 21:54:23 -08:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							567cc26b8e 
							
						 
					 
					
						
						
							
							docs: Component Styles guide for CLI ( #19791 )  
						
						
						
						
					 
					
						2017-11-03 11:12:34 -07: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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Victor Berchet 
							
						 
					 
					
						
						
						
						
							
						
						
							b754e600e3 
							
						 
					 
					
						
						
							
							feat(compiler): add support ::ng-deep  
						
						... 
						
						
						
						- /deep/ is deprecated and being removed from Chrome
- >>> is semantically invalid in a stylesheet
- sass will no longer support either in any version of sass
-> use ::ng-deep in emulated shadow DOM mode
Because the deep combinator is deprecated in the CSS spec,
`/deep/`, `>>>` and `::ng-deep` are also deprecated in emulated shadow DOM mode
and will be removed in the future.
see https://www.chromestatus.com/features/6750456638341120  
						
						
					 
					
						2017-06-23 14:43:42 -07:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							1af42aedfa 
							
						 
					 
					
						
						
							
							docs(aio): doc guide tweaks (GS thru Components)  
						
						... 
						
						
						
						Working through obvious non-image content defects, from top of menu (Getting Started) through Fundamentals/Components. 
						
						
					 
					
						2017-05-09 14:27:27 +01:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							03610526e5 
							
						 
					 
					
						
						
							
							docs(aio): remove hardcoded TOC  
						
						
						
						
					 
					
						2017-05-04 15:51:37 -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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							b70c881c00 
							
						 
					 
					
						
						
							
							docs(aio): fix paths to images  
						
						
						
						
					 
					
						2017-03-06 22:27:32 -08: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