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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							9789413bda
							
						
					 | 
					
						
						
							
							文字微调
						
						
						
						
						
						
					 | 
					
						2016-06-13 16:35:21 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Foxandxss
							
						 
					 | 
					
						
						
						
						
							
						
						
							074a33a622
							
						
					 | 
					
						
						
							
							chore: tslint sweep done
						
						
						
						
						
						
					 | 
					
						2016-06-13 02:40:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							eafa80c89b
							
						
					 | 
					
						
						
							
							校对了ts-to-js部分
						
						
						
						
						
						
					 | 
					
						2016-06-11 21:59:43 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							0b8712d729
							
						
					 | 
					
						
						
							
							微调
						
						
						
						
						
						
					 | 
					
						2016-06-11 12:08:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							f8fd5a1ebd
							
						
					 | 
					
						
						
							
							更明确了ngOnInit的触发时机:每个输入属性的ngOnChanges都完成首次触发之后。
						
						
						
						
						
						
					 | 
					
						2016-06-11 11:28:16 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							164244d77a
							
						
					 | 
					
						
						
							
							修正了api的链接(仅中文版)
						
						
						
						
						
						
					 | 
					
						2016-06-10 14:45:12 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							6b8e09bf2b
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
						
						# Conflicts:
#	public/docs/ts/latest/guide/dependency-injection.jade 
						
						
					 | 
					
						2016-06-10 13:34:18 +08: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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Patrice Chalin
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c77a7fcd1
							
						
					 | 
					
						
						
							
							docs(basics/di): minor edits following TS switch to provider object literal (#1600)
						
						
						
						
						
						
						
						Minor edits:
- Dart side adjustments following #1594.
- Renamed example '3a' to just '3' and tweaked the logger message
- Removed obsolete Dart block. 
						
						
					 | 
					
						2016-06-08 09:25:48 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin YE (Rex)
							
						 
					 | 
					
						
						
						
						
							
						
						
							f24ee2181c
							
						
					 | 
					
						
						
							
							a1-a2-quick-reference.jade review up to pipe/number
						
						
						
						
						
						
					 | 
					
						2016-06-08 17:02:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin YE (Rex)
							
						 
					 | 
					
						
						
						
						
							
						
						
							cc96a317a0
							
						
					 | 
					
						
						
							
							review of upgrade.jade is done.
						
						
						
						
						
						
					 | 
					
						2016-06-08 16:38:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							3fbdfeb710
							
						
					 | 
					
						
						
							
							修正链接
						
						
						
						
						
						
					 | 
					
						2016-06-08 17:07:05 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							80c36ac7f5
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2016-06-08 17:01:20 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							3d01acbf7b
							
						
					 | 
					
						
						
							
							微调翻译
						
						
						
						
						
						
						
						允许翻译中出现省略号 
						
						
					 | 
					
						2016-06-08 16:58:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							934b425cc8
							
						
					 | 
					
						
						
							
							微调翻译
						
						
						
						
						
						
					 | 
					
						2016-06-08 16:22:55 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							f2dbdb3163
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
						
						# Conflicts:
#	public/docs/_examples/cb-component-communication/e2e-spec.ts
#	public/docs/_examples/cb-component-communication/ts/app/app.component.ts
#	public/docs/_examples/dependency-injection/ts/app/main.1.ts
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade 
						
						
					 | 
					
						2016-06-08 10:02:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Foxandxss
							
						 
					 | 
					
						
						
						
						
							
						
						
							fb49cbe33f
							
						
					 | 
					
						
						
							
							docs(cli-quickstart): add cli 5 min quickstart
						
						
						
						
						
						
						
						closes #1606 
						
						
					 | 
					
						2016-06-07 18:51:27 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Patrice Chalin
							
						 
					 | 
					
						
						
						
						
							
						
						
							7e52648ee7
							
						
					 | 
					
						
						
							
							docs(toh): update live example links (#1602)
						
						
						
						
						
						
					 | 
					
						2016-06-07 15:51:25 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin(Rex) YE
							
						 
					 | 
					
						
						
						
						
							
						
						
							b0e86f664f
							
						
					 | 
					
						
						
							
							upgrade.jade review: to line 1622.
						
						
						
						
						
						
					 | 
					
						2016-06-07 22:22:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin YE (Rex)
							
						 
					 | 
					
						
						
						
						
							
						
						
							90a2f1aefa
							
						
					 | 
					
						
						
							
							upgrade.jade to line 461
						
						
						
						
						
						
					 | 
					
						2016-06-07 17:10:02 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin YE (Rex)
							
						 
					 | 
					
						
						
						
						
							
						
						
							8867357e73
							
						
					 | 
					
						
						
							
							webpack.jade review is done.
						
						
						
						
						
						
					 | 
					
						2016-06-07 13:43:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin YE (Rex)
							
						 
					 | 
					
						
						
						
						
							
						
						
							18febb61f0
							
						
					 | 
					
						
						
							
							typescript-configuration.jade review is done.
						
						
						
						
						
						
					 | 
					
						2016-06-07 11:12:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin YE (Rex)
							
						 
					 | 
					
						
						
						
						
							
						
						
							8ef81f1ccb
							
						
					 | 
					
						
						
							
							testing-an-angular-pipe review is done.
						
						
						
						
						
						
					 | 
					
						2016-06-07 10:43:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin YE (Rex)
							
						 
					 | 
					
						
						
						
						
							
						
						
							ce9f3939e5
							
						
					 | 
					
						
						
							
							review of first-app-tests.jade is done.
						
						
						
						
						
						
					 | 
					
						2016-06-07 09:24:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							0a967baf51
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
					 | 
					
						2016-06-07 09:47:24 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							24761d76b8
							
						
					 | 
					
						
						
							
							文字微调
						
						
						
						
						
						
					 | 
					
						2016-06-07 09:46:26 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								jevonearth
							
						 
					 | 
					
						
						
						
						
							
						
						
							f7cf6fde9f
							
						
					 | 
					
						
						
							
							docs(toh-6): Fix typo in 'Add/Delete in the HeroesComponent' section.
						
						
						
						
						
						
						
						closes #1603 
						
						
					 | 
					
						2016-06-06 17:28:07 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ward Bell
							
						 
					 | 
					
						
						
						
						
							
						
						
							06f8002417
							
						
					 | 
					
						
						
							
							docs(pipes): minor text updates
						
						
						
						
						
						
						
						closes #1611 
						
						
					 | 
					
						2016-06-06 17:17:50 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin(Rex) YE
							
						 
					 | 
					
						
						
						
						
							
						
						
							826a11464b
							
						
					 | 
					
						
						
							
							testing/first-app-tests.jade reviewed to line 338
						
						
						
						
						
						
					 | 
					
						2016-06-06 23:01:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin YE (Rex)
							
						 
					 | 
					
						
						
						
						
							
						
						
							8aeead3fb5
							
						
					 | 
					
						
						
							
							jasmine-testing-101.jade and testing.jade: review is done.
						
						
						
						
						
						
					 | 
					
						2016-06-06 17:03:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin YE (Rex)
							
						 
					 | 
					
						
						
						
						
							
						
						
							bdfb15f50f
							
						
					 | 
					
						
						
							
							guide/structural-directives.jade review is done.
						
						
						
						
						
						
					 | 
					
						2016-06-06 16:30:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin YE (Rex)
							
						 
					 | 
					
						
						
						
						
							
						
						
							edc29d7688
							
						
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/angular/angular-cn
						
						
						
						
						
						
					 | 
					
						2016-06-06 13:31:09 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin YE (Rex)
							
						 
					 | 
					
						
						
						
						
							
						
						
							7f281c1063
							
						
					 | 
					
						
						
							
							review of pipes.jade is done.
						
						
						
						
						
						
					 | 
					
						2016-06-06 13:30:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							c45ef7f008
							
						
					 | 
					
						
						
							
							文字微调
						
						
						
						
						
						
					 | 
					
						2016-06-06 17:18:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							8e571257cd
							
						
					 | 
					
						
						
							
							更新了“关于中文版”中的翻译状态
						
						
						
						
						
						
					 | 
					
						2016-06-06 09:52:45 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin(Rex) YE
							
						 
					 | 
					
						
						
						
						
							
						
						
							c16f003d51
							
						
					 | 
					
						
						
							
							review of npm-package.jade is done.
						
						
						
						
						
						
					 | 
					
						2016-06-05 22:48:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin(Rex) YE
							
						 
					 | 
					
						
						
						
						
							
						
						
							0e073bb214
							
						
					 | 
					
						
						
							
							review of lifecycle-hooks is done.
						
						
						
						
						
						
					 | 
					
						2016-06-05 22:15:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin(Rex) YE
							
						 
					 | 
					
						
						
						
						
							
						
						
							49a2deb37b
							
						
					 | 
					
						
						
							
							guide/server-communication.jade review is done.
						
						
						
						
						
						
					 | 
					
						2016-06-05 17:19:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							82f5b1c035
							
						
					 | 
					
						
						
							
							根据 [Joeylin] 的反馈意见,做出微调
						
						
						
						
						
						
					 | 
					
						2016-06-05 06:39:39 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							af77784480
							
						
					 | 
					
						
						
							
							根据 [Joeylin] 的反馈意见,做出微调
						
						
						
						
						
						
					 | 
					
						2016-06-05 06:38:58 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin(Rex) YE
							
						 
					 | 
					
						
						
						
						
							
						
						
							cb8818f171
							
						
					 | 
					
						
						
							
							patch up guide\dependency-injection.jade after official updates.
						
						
						
						
						
						
					 | 
					
						2016-06-04 19:54:25 +01: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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin(Rex) YE
							
						 
					 | 
					
						
						
						
						
							
						
						
							5ae026ced3
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'remotes/angular.io/master'
						
						
						
						
						
						
						
						# Conflicts:
#	public/docs/_examples/dependency-injection/ts/app/main.1.ts
#	public/docs/ts/latest/guide/dependency-injection.jade 
						
						
					 | 
					
						2016-06-04 16:45:10 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								twinssbc
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f02f76fc2
							
						
					 | 
					
						
						
							
							docs: remove duplicated words in toh-pt6.jade
						
						
						
						
						
						
						
						closes #1575 
						
						
					 | 
					
						2016-06-04 01:25:41 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Anastasia Kozaeva
							
						 
					 | 
					
						
						
						
						
							
						
						
							2f3cb405e8
							
						
					 | 
					
						
						
							
							Fix typo in 'Error Handling' section
						
						
						
						
						
						
						
						closes #1592
Remove duplicate 'to' 
						
						
					 | 
					
						2016-06-04 01:24:00 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin YE(Rex)
							
						 
					 | 
					
						
						
						
						
							
						
						
							d5650500c8
							
						
					 | 
					
						
						
							
							Removed @View Decorator
						
						
						
						
						
						
						
						closes #1590 
						
						
					 | 
					
						2016-06-04 01:22:09 -07:00 | 
					
					
						
						
							
							
							
						
					 |