Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							251d4ffe6c
							
						
					 | 
					
						
						
							
							合并了官方的最新更新
						
						
						
						
						
						
					 | 
					
						2016-08-06 20:04:41 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							d034bc33c8
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
						
						# Conflicts:
#	public/contribute.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/component-relative-paths.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade 
						
						
					 | 
					
						2016-08-06 19:52:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brandon Roberts
							
						 
					 | 
					
						
						
						
						
							
						
						
							b93fb12fea
							
						
					 | 
					
						
						
							
							chore(examples): Updated live example links to use helper directive
						
						
						
						
						
						
						
						closes #2005 
						
						
					 | 
					
						2016-08-05 16:41:45 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin YE (Rex)
							
						 
					 | 
					
						
						
						
						
							
						
						
							60a06e51b9
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'angular.io/master'
						
						
						
						
						
						
						
						# Conflicts:
#	README.md
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade 
						
						
					 | 
					
						2016-08-01 09:52:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gerard Sans
							
						 
					 | 
					
						
						
						
						
							
						
						
							abd6febed5
							
						
					 | 
					
						
						
							
							docs(animation): fix typo! =O
						
						
						
						
						
						
						
						closes #1992 
						
						
					 | 
					
						2016-07-29 08:37:31 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Michael
							
						 
					 | 
					
						
						
						
						
							
						
						
							bede1db748
							
						
					 | 
					
						
						
							
							typo(animation) wrong documentation for states
						
						
						
						
						
						
						
						closes #1937 
						
						
					 | 
					
						2016-07-25 10:01:30 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							21fe9dc1d2
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
						
						# Conflicts:
#	README.md
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/testing/first-app-tests.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/news.jade 
						
						
					 | 
					
						2016-07-01 08:24:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								eltronix
							
						 
					 | 
					
						
						
						
						
							
						
						
							1c5be21b32
							
						
					 | 
					
						
						
							
							Fixed typo
						
						
						
						
						
						
					 | 
					
						2016-06-28 12:52:47 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rex
							
						 
					 | 
					
						
						
						
						
							
						
						
							9a6481dee5
							
						
					 | 
					
						
						
							
							review of "我们" keyword for architecture.jade
						
						
						
						
						
						
					 | 
					
						2016-06-20 14:55:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							80a044fa7c
							
						
					 | 
					
						
						
							
							直接加空格方式效果不理想,改用js和css配合来加空格
						
						
						
						
						
						
					 | 
					
						2016-06-19 16:46:50 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							1253d6be4b
							
						
					 | 
					
						
						
							
							先手工给动画一章中的混排英文前后加上一个空格,看看效果
						
						
						
						
						
						
					 | 
					
						2016-06-19 16:02:42 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							71b80b592e
							
						
					 | 
					
						
						
							
							动画一审完毕
						
						
						
						
						
						
					 | 
					
						2016-06-19 09:35:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							acc8321c27
							
						
					 | 
					
						
						
							
							动画初译完毕
						
						
						
						
						
						
					 | 
					
						2016-06-18 23:53:32 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Foxandxss
							
						 
					 | 
					
						
						
						
						
							
						
						
							8664463c3a
							
						
					 | 
					
						
						
							
							remove future features for now
						
						
						
						
						
						
					 | 
					
						2016-06-15 15:14:45 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tero Parviainen
							
						 
					 | 
					
						
						
						
						
							
						
						
							bead3620df
							
						
					 | 
					
						
						
							
							docs(animate): add animations documentation
						
						
						
						
						
						
					 | 
					
						2016-06-15 15:14:45 -07:00 | 
					
					
						
						
							
							
							
						
					 |