Zhimin YE (Rex) 
							
						 
					 
					
						
						
						
						
							
						
						
							654030f09d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'remotes/angular.io/master'  
						
						... 
						
						
						
						# Conflicts:
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade 
						
						
					 
					
						2016-08-23 14:02:54 +01:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							2c8a7982e7 
							
						 
					 
					
						
						
							
							docs: use InMemoryWebApiModule everywhere  
						
						... 
						
						
						
						closes  #2137  
					
						2016-08-19 04:26:36 -07:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE (Rex) 
							
						 
					 
					
						
						
						
						
							
						
						
							eb1ccc6dd4 
							
						 
					 
					
						
						
							
							review: fix dependency-injection in cookbook.  
						
						
						
						
					 
					
						2016-08-16 14:36:20 +01:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE (Rex) 
							
						 
					 
					
						
						
						
						
							
						
						
							873eea9e7e 
							
						 
					 
					
						
						
							
							review: component-communication, testing, upgrade: fixes.  
						
						
						
						
					 
					
						2016-08-16 14:29:37 +01:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							94aa3664ab 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						... 
						
						
						
						# Conflicts:
#	.gitignore
#	public/docs/_examples/cb-component-communication/ts/app/app.component.ts
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.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/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade 
						
						
					 
					
						2016-08-12 07:57:51 +08:00 
						 
				 
			
				
					
						
							
							
								Aysegul Yonet 
							
						 
					 
					
						
						
						
						
							
						
						
							5de00cc591 
							
						 
					 
					
						
						
							
							docs(rc4-to-rc5):fix npm for angular-cli  
						
						... 
						
						
						
						closes  #2072  
					
						2016-08-09 22:35:23 -07:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							162b1773be 
							
						 
					 
					
						
						
							
							docs(rc4-to-rc5): fix npm for MD  
						
						... 
						
						
						
						closes  #2067  
					
						2016-08-09 17:55:32 -07:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							38a59f91bd 
							
						 
					 
					
						
						
							
							docs: small, quick fixes for RC5 including link repair. ( #2062 )  
						
						
						
						
					 
					
						2016-08-09 15:56:47 -07:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							fe35bc6c31 
							
						 
					 
					
						
						
							
							docs(rc4-to-rc5): New RC4->RC5 migration cookbook.  
						
						
						
						
					 
					
						2016-08-09 12:28:25 -07:00 
						 
				 
			
				
					
						
							
							
								Peter Bacon Darwin 
							
						 
					 
					
						
						
						
						
							
						
						
							d79adb2422 
							
						 
					 
					
						
						
							
							docs(rc5): update docs and plunkers for rc5  
						
						
						
						
					 
					
						2016-08-09 11:48:07 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							9c4b801f8a 
							
						 
					 
					
						
						
							
							更正一个编译bug  
						
						
						
						
					 
					
						2016-08-06 20:17:07 +08:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Peter Bacon Darwin 
							
						 
					 
					
						
						
						
						
							
						
						
							9f03fca039 
							
						 
					 
					
						
						
							
							docs(cookbook): text following a node requires a dot  
						
						
						
						
					 
					
						2016-08-06 07:45:32 +01:00 
						 
				 
			
				
					
						
							
							
								Brandon Roberts 
							
						 
					 
					
						
						
						
						
							
						
						
							b93fb12fea 
							
						 
					 
					
						
						
							
							chore(examples): Updated live example links to use helper directive  
						
						... 
						
						
						
						closes  #2005  
					
						2016-08-05 16:41:45 -07:00 
						 
				 
			
				
					
						
							
							
								Torgeir Helgevold 
							
						 
					 
					
						
						
						
						
							
						
						
							daac8fffbe 
							
						 
					 
					
						
						
							
							docs(cb-dynamic-forms): update subtitle  
						
						... 
						
						
						
						closes  #2004  
					
						2016-08-01 12:49:15 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							28fe7d848f 
							
						 
					 
					
						
						
							
							把“作用范围”批量改为“作用域”  
						
						
						
						
					 
					
						2016-07-24 17:31:51 +08:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE (Rex) 
							
						 
					 
					
						
						
						
						
							
						
						
							0e14785cba 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'angular.io/master'  
						
						... 
						
						
						
						# Conflicts:
#	README.md
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/testing/first-app-tests.jade
#	public/docs/ts/latest/testing/jasmine-testing-101.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade 
						
						
					 
					
						2016-07-15 15:52:34 +01:00 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							98e5d4af77 
							
						 
					 
					
						
						
							
							docs(all): link cleanup - broken and outdated  
						
						... 
						
						
						
						closes  #1841 
Fixes all broken links except genuine errors (see #1840 ), have been
resolved as of 2016-07-06
(https://github.com/angular/angular/commit/2708ce6a17667a2369c83bcf244c9 
366b058d4c9).
Fixes  #1574  
					
						2016-07-11 21:50:07 -07:00 
						 
				 
			
				
					
						
							
							
								Brandon Roberts 
							
						 
					 
					
						
						
						
						
							
						
						
							5104470558 
							
						 
					 
					
						
						
							
							docs(router): Removed refs to deprecated router; lowerCamelCase constants  
						
						... 
						
						
						
						closes  #1834  
					
						2016-07-11 21:44:12 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							6264d3bcde 
							
						 
					 
					
						
						
							
							批量把Provider/provide改译为提供商/提供,以和ISP(互联网服务提供商)的译法看齐  
						
						
						
						
					 
					
						2016-07-07 08:22:36 +08: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 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							fb22c0556c 
							
						 
					 
					
						
						
							
							内容微调  
						
						
						
						
					 
					
						2016-06-29 13:11:23 +08:00 
						 
				 
			
				
					
						
							
							
								Filipe Silva 
							
						 
					 
					
						
						
						
						
							
						
						
							58d20e57b5 
							
						 
					 
					
						
						
							
							chore: update ngSwitchWhen to ngSwitchCase  
						
						... 
						
						
						
						See https://github.com/angular/angular/commit/e1fcab7  
						
						
					 
					
						2016-06-28 12:52:47 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							d7a71ccf59 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						... 
						
						
						
						# Conflicts:
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade 
						
						
					 
					
						2016-06-28 09:40:49 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							9f2c4270e1 
							
						 
					 
					
						
						
							
							调整了导航菜单,直接显示新版  
						
						
						
						
					 
					
						2016-06-23 09:22:50 +08:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Naomi Black 
							
						 
					 
					
						
						
						
						
							
						
						
							987fbad0f3 
							
						 
					 
					
						
						
							
							chore(nav): clean up left nav titles and alpha-sort them  
						
						
						
						
					 
					
						2016-06-22 17:13:48 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							443f726a04 
							
						 
					 
					
						
						
							
							重新开放dart版  
						
						... 
						
						
						
						接受网友Z的一个修订意见 
						
						
					 
					
						2016-06-23 08:05:05 +08:00 
						 
				 
			
				
					
						
							
							
								Torgeir Helgevold 
							
						 
					 
					
						
						
						
						
							
						
						
							3cb219c5ab 
							
						 
					 
					
						
						
							
							docs(dynamic-cookbook): upgrade to use new forms api  
						
						... 
						
						
						
						convert exiting to use deprecated name
converted to new api
text
warnings
fix plunker
text
test weak
text
space
text
lint
order
tweak 
						
						
					 
					
						2016-06-20 21:02:28 -04:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							64b9e476fb 
							
						 
					 
					
						
						
							
							把alternative统一改为备选或替代品(取决于语境)  
						
						
						
						
					 
					
						2016-06-21 07:54:34 +08:00 
						 
				 
			
				
					
						
							
							
								Rex 
							
						 
					 
					
						
						
						
						
							
						
						
							3659248ee5 
							
						 
					 
					
						
						
							
							continue review of "我们" keyword.  
						
						
						
						
					 
					
						2016-06-20 12:29:43 +01:00 
						 
				 
			
				
					
						
							
							
								Rex 
							
						 
					 
					
						
						
						
						
							
						
						
							77cdd8bde8 
							
						 
					 
					
						
						
							
							review all "我们" keyword, making the translations  more natural.  
						
						
						
						
					 
					
						2016-06-20 10:59:00 +01:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							e3b33ab31c 
							
						 
					 
					
						
						
							
							VS2015集成完毕;第三方资源汉化完毕  
						
						
						
						
					 
					
						2016-06-18 14:35:32 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							d1db5bfb72 
							
						 
					 
					
						
						
							
							翻译了教程中的HTTP一章  
						
						
						
						
					 
					
						2016-06-17 23:13:23 +08:00 
						 
				 
			
				
					
						
							
							
								Rex 
							
						 
					 
					
						
						
						
						
							
						
						
							92716c90c6 
							
						 
					 
					
						
						
							
							visual-studio-2015.jade localized.  
						
						
						
						
					 
					
						2016-06-16 11:35:58 +01:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE (Rex) 
							
						 
					 
					
						
						
						
						
							
						
						
							466f69d30a 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'remotes/angular.io/master'  
						
						... 
						
						
						
						# Conflicts:
#	public/docs/ts/latest/cookbook/_data.json
#	tools/api-builder/angular.io-package/templates/class.template.html 
						
						
					 
					
						2016-06-15 12:01:54 +01:00 
						 
				 
			
				
					
						
							
							
								Deborah Kurata 
							
						 
					 
					
						
						
						
						
							
						
						
							e7f3fc61ce 
							
						 
					 
					
						
						
							
							docs(cb-vs2015) new cookbook for Visual Studio 2015 QuickStart  
						
						... 
						
						
						
						closes  #1502  
					
						2016-06-13 23:55:14 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							bc2e4b83c0 
							
						 
					 
					
						
						
							
							把所有全角括号改成了半角的  
						
						
						
						
					 
					
						2016-06-14 09:26:54 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							e338333e2f 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						... 
						
						
						
						# Conflicts:
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/guide/attribute-directives.jade 
						
						
					 
					
						2016-06-13 16:39:34 +08:00 
						 
				 
			
				
					
						
							
							
								Foxandxss 
							
						 
					 
					
						
						
						
						
							
						
						
							074a33a622 
							
						 
					 
					
						
						
							
							chore: tslint sweep done  
						
						
						
						
					 
					
						2016-06-13 02:40:28 +02:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE (Rex) 
							
						 
					 
					
						
						
						
						
							
						
						
							f694255b7b 
							
						 
					 
					
						
						
							
							review of component-relative-paths.jade  
						
						
						
						
					 
					
						2016-06-09 14:34:12 +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) 
							
						 
					 
					
						
						
						
						
							
						
						
							0bc85d4850 
							
						 
					 
					
						
						
							
							a1-a2-quick-reference.jade review is done.  
						
						
						
						
					 
					
						2016-06-09 09:44:21 +01:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE (Rex) 
							
						 
					 
					
						
						
						
						
							
						
						
							f24ee2181c 
							
						 
					 
					
						
						
							
							a1-a2-quick-reference.jade review up to pipe/number  
						
						
						
						
					 
					
						2016-06-08 17:02:41 +01:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							8e571257cd 
							
						 
					 
					
						
						
							
							更新了“关于中文版”中的翻译状态  
						
						
						
						
					 
					
						2016-06-06 09:52:45 +08:00 
						 
				 
			
				
					
						
							
							
								Zhimin(Rex) YE 
							
						 
					 
					
						
						
						
						
							
						
						
							633964ac2f 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'remotes/angular.io/master'  
						
						... 
						
						
						
						# Conflicts:
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/upgrade.jade 
						
						
					 
					
						2016-06-04 17:52:51 +01:00 
						 
				 
			
				
					
						
							
							
								Foxandxss 
							
						 
					 
					
						
						
						
						
							
						
						
							c185c3548c 
							
						 
					 
					
						
						
							
							chore: use the provide object literal  
						
						... 
						
						
						
						closes  #1594 
replace `provide(...{use:...})` with `{provide: ..., use...}` syntax 
					
						2016-06-04 01:33:36 -07: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