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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								priestch
							
						 
					 | 
					
						
						
						
						
							
						
						
							b21c90c358
							
						
					 | 
					
						
						
							
							fix(doc): fix 404 problem of some api url
						
						
						
						
						
						
					 | 
					
						2016-06-28 22:25:24 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							bc2e4b83c0
							
						
					 | 
					
						
						
							
							把所有全角括号改成了半角的
						
						
						
						
						
						
					 | 
					
						2016-06-14 09:26:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							eafa80c89b
							
						
					 | 
					
						
						
							
							校对了ts-to-js部分
						
						
						
						
						
						
					 | 
					
						2016-06-11 21:59:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							164244d77a
							
						
					 | 
					
						
						
							
							修正了api的链接(仅中文版)
						
						
						
						
						
						
					 | 
					
						2016-06-10 14:45:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin YE (Rex)
							
						 
					 | 
					
						
						
						
						
							
						
						
							f694255b7b
							
						
					 | 
					
						
						
							
							review of component-relative-paths.jade
						
						
						
						
						
						
					 | 
					
						2016-06-09 14:34:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin YE (Rex)
							
						 
					 | 
					
						
						
						
						
							
						
						
							734e178382
							
						
					 | 
					
						
						
							
							minor change to ts-to-js.jade.
						
						
						
						
						
						
					 | 
					
						2016-06-09 14:19:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin YE (Rex)
							
						 
					 | 
					
						
						
						
						
							
						
						
							8ae3d52cbc
							
						
					 | 
					
						
						
							
							minor change to ts-to-js.jade review.
						
						
						
						
						
						
					 | 
					
						2016-06-09 14:18:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin YE (Rex)
							
						 
					 | 
					
						
						
						
						
							
						
						
							c36425eec7
							
						
					 | 
					
						
						
							
							ts-to-js.jade review is done.
						
						
						
						
						
						
					 | 
					
						2016-06-09 12:48:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							940d0d9c22
							
						
					 | 
					
						
						
							
							开发指南-生命周期钩子 翻译完毕
						
						
						
						
						
						
					 | 
					
						2016-05-26 19:02:38 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rex Ye
							
						 
					 | 
					
						
						
						
						
							
						
						
							78fc8d1e0f
							
						
					 | 
					
						
						
							
							ts-to-js.jade draft translation is done.
						
						
						
						
						
						
					 | 
					
						2016-05-23 14:34:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							335ac9d0a3
							
						
					 | 
					
						
						
							
							全部“烹饪书”改名为“烹饪宝典”
						
						
						
						
						
						
					 | 
					
						2016-05-22 19:26:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rex Ye
							
						 
					 | 
					
						
						
						
						
							
						
						
							fd8e9c4729
							
						
					 | 
					
						
						
							
							ts-to-ts.jade 部分翻译
						
						
						
						
						
						
					 | 
					
						2016-05-16 15:15:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rex Ye
							
						 
					 | 
					
						
						
						
						
							
						
						
							74c5868747
							
						
					 | 
					
						
						
							
							修正pattern的翻译,开始js-to-ts翻译。
						
						
						
						
						
						
					 | 
					
						2016-05-16 11:20:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ward Bell
							
						 
					 | 
					
						
						
						
						
							
						
						
							3d5302adce
							
						
					 | 
					
						
						
							
							chore: update to rc.0
						
						
						
						
						
						
					 | 
					
						2016-05-02 19:57:28 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tero Parviainen
							
						 
					 | 
					
						
						
						
						
							
						
						
							7f11a6ce05
							
						
					 | 
					
						
						
							
							docs(cb-ts-to-js): add cookbook about applying TypeScript examples to ES5
						
						
						
						
						
						
						
						closes #893 
						
						
					 | 
					
						2016-03-27 23:36:51 -07:00 | 
					
					
						
						
							
							
							
						
					 |