Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							bb9adc3eba 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						... 
						
						
						
						# Conflicts:
#	README.md
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/style-guide.jade 
						
						
					 
					
						2016-06-23 08:48:57 +08:00 
						 
				 
			
				
					
						
							
							
								Filipe Silva 
							
						 
					 
					
						
						
						
						
							
						
						
							7848feaeaa 
							
						 
					 
					
						
						
							
							chore: update to rc3  
						
						
						
						
					 
					
						2016-06-22 01:51:57 +01:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							0aa207bbac 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						... 
						
						
						
						# Conflicts:
#	public/docs/ts/latest/guide/_data.json 
						
						
					 
					
						2016-06-19 10:17:03 +08:00 
						 
				 
			
				
					
						
							
							
								Filipe Silva 
							
						 
					 
					
						
						
						
						
							
						
						
							61c85a92a4 
							
						 
					 
					
						
						
							
							chore: add async/await support to e2e tests  
						
						
						
						
					 
					
						2016-06-17 10:43:16 -07:00 
						 
				 
			
				
					
						
							
							
								Filipe Silva 
							
						 
					 
					
						
						
						
						
							
						
						
							643c59a15e 
							
						 
					 
					
						
						
							
							fix(e2e): update broken node typings  
						
						
						
						
					 
					
						2016-06-17 13:52:30 +01:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE (Rex) 
							
						 
					 
					
						
						
						
						
							
						
						
							dd4e887b47 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'remotes/angular.io/master'  
						
						... 
						
						
						
						# Conflicts:
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/upgrade.jade 
						
						
					 
					
						2016-06-02 08:58:19 +01:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							41947cbd1f 
							
						 
					 
					
						
						
							
							chore: fix gulp serve-and-sync tasks and many broken example links  
						
						... 
						
						
						
						The serve-and-sync tasks wait for `_copy-example-boilerplate` to finish
Differentiates app compile, spec compile, and test failures
StyleGuide (for documentators) up-to-date 
						
						
					 
					
						2016-06-01 16:17:06 -07:00 
						 
				 
			
				
					
						
							
							
								Foxandxss 
							
						 
					 
					
						
						
						
						
							
						
						
							3c3b83a34b 
							
						 
					 
					
						
						
							
							chore(e2e): append errors after a failed spec  
						
						... 
						
						
						
						closes  #1579  
					
						2016-06-01 11:20:35 -07:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE (Rex) 
							
						 
					 
					
						
						
						
						
							
						
						
							72efc8f055 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'remotes/angular.io/master'  
						
						... 
						
						
						
						# Conflicts:
#	README.md
#	public/contribute.jade
#	public/docs/_examples/cb-component-communication/e2e-spec.ts
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade 
						
						
					 
					
						2016-06-01 09:51:27 +01:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							8a5df4cfa9 
							
						 
					 
					
						
						
							
							chore: support e2e-specs written in TypeScript  
						
						... 
						
						
						
						Update gulpfile and project to add a tsconfig to protractor test folders
Change all sample e2e-spec.js -> e2e-spec.ts
Split typings between e2e-spec & app code
Use same config for all e2e tests
Only 1/3 e2e specs truly converted.
Most don't pass because they fail TS transpile by Protractor due to missing type annotations 
						
						
					 
					
						2016-05-31 22:03:13 -07:00