Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							583247f0f9
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
						
						# Conflicts:
#	public/_data.json
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/_includes/_main-nav.jade
#	public/docs/_includes/_side-nav.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/features.jade
#	public/index.jade 
						
						
					 | 
					
						2016-05-03 22:33:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ward Bell
							
						 
					 | 
					
						
						
						
						
							
						
						
							3d5302adce
							
						
					 | 
					
						
						
							
							chore: update to rc.0
						
						
						
						
						
						
					 | 
					
						2016-05-02 19:57:28 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Foxandxss
							
						 
					 | 
					
						
						
						
						
							
						
						
							6c0c6357a9
							
						
					 | 
					
						
						
							
							docs: rename heros to heroes
						
						
						
						
						
						
					 | 
					
						2016-05-01 23:04:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Filipe Silva
							
						 
					 | 
					
						
						
						
						
							
						
						
							216120daba
							
						
					 | 
					
						
						
							
							chore: update to beta.17
						
						
						
						
						
						
						
						closes #1213, 1205 
						
						
					 | 
					
						2016-04-28 18:31:00 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ward Bell
							
						 
					 | 
					
						
						
						
						
							
						
						
							555ec46be3
							
						
					 | 
					
						
						
							
							docs(e2e): workaround comp-comm interval timer tests
						
						
						
						
						
						
						
						closes #1081
Note how `browser.get('?e2e')` enables app to know it is running under protractor
						
						
					 | 
					
						2016-04-12 18:51:17 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Foxandxss
							
						 
					 | 
					
						
						
						
						
							
						
						
							5f73911eaf
							
						
					 | 
					
						
						
							
							chore(toh): change inputs array for input decorator/hero now a class
						
						
						
						
						
						
					 | 
					
						2016-03-25 16:51:46 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ward Bell
							
						 
					 | 
					
						
						
						
						
							
						
						
							a2cb80330a
							
						
					 | 
					
						
						
							
							docs: update to beta-12
						
						
						
						
						
						
					 | 
					
						2016-03-23 21:39:13 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ward Bell
							
						 
					 | 
					
						
						
						
						
							
						
						
							639ca37de5
							
						
					 | 
					
						
						
							
							docs: update to beta-11
						
						
						
						
						
						
						
						closes #987
also updated lifecycle-hooks/e2e-spec for changed hook calling sequence (not a bug; just a change) 
						
						
					 | 
					
						2016-03-18 19:22:00 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ward Bell
							
						 
					 | 
					
						
						
						
						
							
						
						
							513e919be5
							
						
					 | 
					
						
						
							
							docs(comp comm cookbook): add #localvar alternative for parent calling child
						
						
						
						
						
						
						
						also fixes glossary decorator-flag bug 
						
						
					 | 
					
						2016-03-07 14:12:48 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ward Bell
							
						 
					 | 
					
						
						
						
						
							
						
						
							ad7f172ea5
							
						
					 | 
					
						
						
							
							docs: share 'styles.css' across all samples all langs; fix styles
						
						
						
						
						
						
					 | 
					
						2016-02-28 12:47:01 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ward Bell
							
						 
					 | 
					
						
						
						
						
							
						
						
							524ff05373
							
						
					 | 
					
						
						
							
							chore: add shims_for_IE.js to all index.html
						
						
						
						
						
						
					 | 
					
						2016-02-25 14:04:37 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ward Bell
							
						 
					 | 
					
						
						
						
						
							
						
						
							823950b936
							
						
					 | 
					
						
						
							
							docs(cookbook/component-communication): clear interval timer in OnDestroy
						
						
						
						
						
						
					 | 
					
						2016-02-22 02:40:57 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Novak Istvan
							
						 
					 | 
					
						
						
						
						
							
						
						
							daae4f1429
							
						
					 | 
					
						
						
							
							docs(cookbook/component-communication): first of the cookbook series
						
						
						
						
						
						
						
						closes #824 
						
						
					 | 
					
						2016-02-21 23:19:40 -08:00 | 
					
					
						
						
							
							
							
						
					 |