Zhimin YE 
							
						 
					 
					
						
						
						
						
							
						
						
							4578087fa5 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'remotes/angular.io/master'  
						
						... 
						
						
						
						# Conflicts:
#	README.md
#	harp.json
#	public/_includes/_hero-home.jade
#	public/docs/_examples/quickstart/ts/systemjs.config.1.js
#	public/docs/dart/latest/_util-fns.jade
#	public/docs/dart/latest/api/_data.json
#	public/docs/dart/latest/api/index.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/visual-studio-2015.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/change-log.jade
#	public/docs/ts/latest/guide/npm-packages.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/template-syntax.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
Server Communication and Visual studio 2015 require further merging. 
						
						
					 
					
						2016-11-03 15:38:23 +00:00 
						 
				 
			
				
					
						
							
							
								Torgeir Helgevold 
							
						 
					 
					
						
						
						
						
							
						
						
							3eb7a41602 
							
						 
					 
					
						
						
							
							docs(aot-cb):bundle in-mem-web-api with esm and umd ( #2617 )  
						
						... 
						
						
						
						s
s 
						
						
					 
					
						2016-10-19 21:52:32 -07:00 
						 
				 
			
				
					
						
							
							
								rexebin 
							
						 
					 
					
						
						
						
						
							
						
						
							8202c332c2 
							
						 
					 
					
						
						
							
							fix: aot-compiler  
						
						
						
						
					 
					
						2016-10-18 19:24:18 +01:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE 
							
						 
					 
					
						
						
						
						
							
						
						
							45b9e57b52 
							
						 
					 
					
						
						
							
							fix: aot-compiler  
						
						
						
						
					 
					
						2016-10-18 16:54:21 +01:00 
						 
				 
			
				
					
						
							
							
								Aristeidis Bampakos 
							
						 
					 
					
						
						
						
						
							
						
						
							3508b7988d 
							
						 
					 
					
						
						
							
							docs(cb-aot): fix typo in tab names. ( #2621 )  
						
						
						
						
					 
					
						2016-10-18 15:11:24 +02: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 
						 
				 
			
				
					
						
							
							
								Rex 
							
						 
					 
					
						
						
						
						
							
						
						
							abdb946d3b 
							
						 
					 
					
						
						
							
							fix :  #96  
						
						
						
						
					 
					
						2016-10-17 15:15:00 +01:00 
						 
				 
			
				
					
						
							
							
								Torgeir Helgevold 
							
						 
					 
					
						
						
						
						
							
						
						
							cdfe957ab8 
							
						 
					 
					
						
						
							
							docs(toh-6-aot): add aot to toh-6 ( #2496 )  
						
						... 
						
						
						
						* docs(toh-6-aot): add aot to toh-6
s
s
s
s
s
* docs(toh-6-aot): add aot to toh-6
* docs(toh-6-aot): make aot e2e tests run in the same project
Updates tooling for this purpose and also the prose. 
						
						
					 
					
						2016-10-12 01:44:49 -07:00 
						 
				 
			
				
					
						
							
							
								倪述荣 
							
						 
					 
					
						
						
						
						
							
						
						
							1f47f27c9e 
							
						 
					 
					
						
						
							
							修正一个笔误:重新编译  
						
						
						
						
					 
					
						2016-09-22 15:27:49 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							b2fcb1a2e6 
							
						 
					 
					
						
						
							
							翻译完了AoT compiler  
						
						
						
						
					 
					
						2016-09-16 18:13:42 +08:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							d64cb11635 
							
						 
					 
					
						
						
							
							docs(aot): remove typescript instruction  
						
						
						
						
					 
					
						2016-09-14 14:49:25 -07:00 
						 
				 
			
				
					
						
							
							
								Torgeir Helgevold 
							
						 
					 
					
						
						
						
						
							
						
						
							6813ced018 
							
						 
					 
					
						
						
							
							docs(cookbook - aot compiler) ( #2161 )  
						
						... 
						
						
						
						docs(cb-aot-compiler): new cookbook on AoT compiler 
						
						
					 
					
						2016-09-14 10:10:04 -07:00