Hongbo Miao 
							
						 
					 
					
						
						
						
						
							
						
						
							b4a194634c 
							
						 
					 
					
						
						
							
							add lost info back  
						
						
						
						
					 
					
						2016-07-13 23:30:40 -04:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							e2892d1382 
							
						 
					 
					
						
						
							
							纠正一个翻译错误,来自wudingli。  
						
						
						
						
					 
					
						2016-07-14 10:41:54 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							c8ec2db73c 
							
						 
					 
					
						
						
							
							翻译了一个遗漏的新增英文  
						
						
						
						
					 
					
						2016-07-14 10:06:13 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							3789144368 
							
						 
					 
					
						
						
							
							根据网友pshadow的勘误,改正一个错误  
						
						
						
						
					 
					
						2016-07-14 07:52:12 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							46ea47d126 
							
						 
					 
					
						
						
							
							添加dialog.service导致了编译错误,修正回去  
						
						
						
						
					 
					
						2016-07-12 13:52:49 +08:00 
						 
				 
			
				
					
						
							
							
								Foxandxss 
							
						 
					 
					
						
						
						
						
							
						
						
							50b51f6bdc 
							
						 
					 
					
						
						
							
							docs(router): fix broken links in router chapters  
						
						... 
						
						
						
						closes  #1843  
					
						2016-07-11 21:57:15 -07: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 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							761f857f13 
							
						 
					 
					
						
						
							
							docs(architecture/dart): proofread, updated Dart/TS app and jade  
						
						... 
						
						
						
						closes  #1807 
- e2e tests now also cover the tax calculator.
- Dart app updated to match TS (it had no sales tax calculator).
- TS sample source cleanup (e.g. removed many unnecessary `docregions`).
- Prose updated to include @kwalrath's revisions from a while ago, Ward's comments, and
some of my edits as well.
Contributes to #1598  and #1508 . 
					
						2016-07-11 20:35:06 -07:00 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							fb9edf972e 
							
						 
					 
					
						
						
							
							chore: fix "Invalid example" warnings from shred map builder  
						
						... 
						
						
						
						closes  #1832 
The shred map (xref) builder was issuing warnings. This fix includes
- Adjustments to the shredder map builder itself so that it
understands, e.g., app-project relative example paths.
- `**/guide/glossary.jade` now (Jade) `includes` the shared parent
`glossary.jade` rather than (Harp) importing (via `partial`). This
fixes `makeExample` path issues in the glossary.
- Adjusted some `makeExample` paths that were ok for site build, but
confused the xref tool. 
					
						2016-07-11 20:10:56 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							2eb5463384 
							
						 
					 
					
						
						
							
							微调  
						
						
						
						
					 
					
						2016-07-11 13:13:01 +08:00 
						 
				 
			
				
					
						
							
							
								雪狼 
							
						 
					 
					
						
						
						
						
							
						
						
							aae9cc20d1 
							
						 
					 
					
						
						
							
							Merge pull request  #16  from dreamapplehappy/dreamapple-contribute  
						
						... 
						
						
						
						翻译的一点建议 
						
						
					 
					
						2016-07-11 13:11:44 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							f6eba2df5e 
							
						 
					 
					
						
						
							
							根据gogobook的反馈添加了dialog.service  
						
						... 
						
						
						
						鸣谢里添加了给出反馈的github网友 
						
						
					 
					
						2016-07-11 13:04:16 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							ac9e032b51 
							
						 
					 
					
						
						
							
							根据	wudingli 的反馈修正了翻译  
						
						
						
						
					 
					
						2016-07-11 12:51:41 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							210b076594 
							
						 
					 
					
						
						
							
							根据网上反馈去掉了路由名字,新版已经不需要了。  
						
						
						
						
					 
					
						2016-07-11 12:46:21 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							fb60f9c4c5 
							
						 
					 
					
						
						
							
							翻译了一段儿新增内容  
						
						
						
						
					 
					
						2016-07-11 08:37:48 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							273a0fd1e8 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						... 
						
						
						
						# Conflicts:
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/guide/webpack.jade 
						
						
					 
					
						2016-07-11 08:32:56 +08:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							0664a271ba 
							
						 
					 
					
						
						
							
							docs(style-guide): spell const variables in lower camel case  
						
						... 
						
						
						
						Changes previous guidance on const which insisted on UPPER_SNAKE_CASE 
						
						
					 
					
						2016-07-07 22:41:04 -07:00 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							801ac76da0 
							
						 
					 
					
						
						
							
							docs(guide/displaying-data): proofread ( #1819 )  
						
						... 
						
						
						
						* docs(displaying-data/dart): proofread
- Dart prose simplified by removing discussion of "additions to
pubspec.yaml" which are no longer necessary given the current state of
QuickStart.
- E2e suites passed:
  public/docs/_examples/displaying-data/dart
  public/docs/_examples/displaying-data/ts
Contributes to #1598  and #1508 .
* docs(displaying-data/ts): proofread
- TS prose updated to include @kwalrath's revisions from a while ago,
with some of my edits as well.
- E2e suites passed:
  public/docs/_examples/displaying-data/dart
  public/docs/_examples/displaying-data/ts
* docs(displaying-data/ts): post-review edits 
						
						
					 
					
						2016-07-07 14:00:19 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							6264d3bcde 
							
						 
					 
					
						
						
							
							批量把Provider/provide改译为提供商/提供,以和ISP(互联网服务提供商)的译法看齐  
						
						
						
						
					 
					
						2016-07-07 08:22:36 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							0303a18020 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						... 
						
						
						
						# Conflicts:
#	README.md
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/structural-directives.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/testing/testing-an-angular-pipe.jade
#	public/docs/ts/latest/tutorial/index.jade
#	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
#	public/docs/ts/latest/tutorial/toh-pt6.jade 
						
						
					 
					
						2016-07-07 08:15:51 +08:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							d1dd2b82f4 
							
						 
					 
					
						
						
							
							docs(router): changes suggested by Deb Kurata in  #1808  
						
						
						
						
					 
					
						2016-07-06 01:11:34 -07:00 
						 
				 
			
				
					
						
							
							
								Christos Koutsiaris 
							
						 
					 
					
						
						
						
						
							
						
						
							7f991dc4f1 
							
						 
					 
					
						
						
							
							docs(typescript-configuration): TypeScript handbook documentation link change  
						
						... 
						
						
						
						closes  #1830 
Page has moved to http://www.typescriptlang.org/docs/handbook/tsconfig-json.html  
					
						2016-07-05 23:41:15 -07:00 
						 
				 
			
				
					
						
							
							
								Foxandxss 
							
						 
					 
					
						
						
						
						
							
						
						
							341f32d7f6 
							
						 
					 
					
						
						
							
							docs(webpack): add angular2-template-loader  
						
						... 
						
						
						
						closes  #1825  
					
						2016-07-05 23:25:07 -07:00 
						 
				 
			
				
					
						
							
							
								Foxandxss 
							
						 
					 
					
						
						
						
						
							
						
						
							37b377ddb3 
							
						 
					 
					
						
						
							
							docs: update node and npm version recommendations  
						
						... 
						
						
						
						closes  #1821  
					
						2016-07-05 23:09:37 -07:00 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							b0e0d94b5c 
							
						 
					 
					
						
						
							
							docs: revert Jade to markdown  
						
						... 
						
						
						
						closes  #1818 
Previously, the markdown of some chapters was converted to Jade markup
to support the conditional exclusion of TS prose parts in Dart
chapters. This commit reverts some of that back to clean markdown,
thanks to a few custom directives. 
					
						2016-07-05 23:03:30 -07:00 
						 
				 
			
				
					
						
							
							
								eltronix 
							
						 
					 
					
						
						
						
						
							
						
						
							e2cd8ffe1d 
							
						 
					 
					
						
						
							
							docs(testing): Fixed typo in pipe.jade  
						
						... 
						
						
						
						closes  #1805  
					
						2016-07-05 21:06:13 -07:00 
						 
				 
			
				
					
						
							
							
								Stephen Fox 
							
						 
					 
					
						
						
						
						
							
						
						
							e766f666bd 
							
						 
					 
					
						
						
							
							docs(http): Small typo fix in sentence reference to items: Observable  
						
						... 
						
						
						
						Ward tacked on router: ngDestroy -> ngOnDestroy
closes  #1690  
						
						
					 
					
						2016-07-05 20:55:03 -07:00 
						 
				 
			
				
					
						
							
							
								dreamapple 
							
						 
					 
					
						
						
						
						
							
						
						
							50225ceea4 
							
						 
					 
					
						
						
							
							翻译的一点修改 位置:user-input.jade  
						
						
						
						
					 
					
						2016-07-05 14:56:01 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							be4748bce0 
							
						 
					 
					
						
						
							
							修改了一系列小bug  
						
						... 
						
						
						
						微调“关于”页面 
						
						
					 
					
						2016-07-05 08:35:08 +08:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE (Rex) 
							
						 
					 
					
						
						
						
						
							
						
						
							24ab1e5fcc 
							
						 
					 
					
						
						
							
							Chore: break a line in toh-pt1  
						
						
						
						
					 
					
						2016-07-04 12:00:32 +01:00 
						 
				 
			
				
					
						
							
							
								Zhimin(Rex) YE 
							
						 
					 
					
						
						
						
						
							
						
						
							3184375783 
							
						 
					 
					
						
						
							
							correction: router sample correction  
						
						
						
						
					 
					
						2016-07-03 17:38:33 +01:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							711a173606 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						... 
						
						
						
						# Conflicts:
#	public/docs/ts/latest/guide/router.jade 
						
						
					 
					
						2016-07-03 15:27:10 +08:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							fdbb7b5184 
							
						 
					 
					
						
						
							
							docs(router): clarify router redirect and link to Victor's blog post  
						
						
						
						
					 
					
						2016-07-02 15:51:49 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							3c5a045633 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						... 
						
						
						
						# Conflicts:
#	public/docs/ts/latest/guide/router.jade 
						
						
					 
					
						2016-07-02 19:16:00 +08:00 
						 
				 
			
				
					
						
							
							
								Foxandxss 
							
						 
					 
					
						
						
						
						
							
						
						
							1900eb1c70 
							
						 
					 
					
						
						
							
							docs: replace terminal with pathMatch, base href with '/'  
						
						... 
						
						
						
						closes  #1799  
					
						2016-07-01 16:32:39 -07:00 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							0ba3d5d8d6 
							
						 
					 
					
						
						
							
							docs(dart/{quickstart,toh-[56]}): fix project names ( #1773 )  
						
						... 
						
						
						
						- Renamed `angular2_getting_started` to `angular2_quickstart` (to match
TS).
- s/-/_/g in project names elsewhere (only toh-5 & -6 needed to be
updated).
Fixes  #378 . 
						
						
					 
					
						2016-07-01 11:05:45 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							0dd2932a2e 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						... 
						
						
						
						# Conflicts:
#	public/_data.json
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/news.jade
#	public/resources/_data.json
#	public/resources/index.ejs
#	public/resources/js/controllers/resources-controller.js 
						
						
					 
					
						2016-07-01 08:38:54 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							1a806de866 
							
						 
					 
					
						
						
							
							移除行尾不必要的空格  
						
						
						
						
					 
					
						2016-07-01 08:26:45 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							dfc20a6adc 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'cn/master'  
						
						
						
						
					 
					
						2016-07-01 08:25:35 +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 
						 
				 
			
				
					
						
							
							
								Naomi Black 
							
						 
					 
					
						
						
						
						
							
						
						
							314ff5627b 
							
						 
					 
					
						
						
							
							chore(version): update the version to rc4  
						
						
						
						
					 
					
						2016-06-30 13:08:08 -07:00 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							7d50fa9302 
							
						 
					 
					
						
						
							
							post-review updates  
						
						... 
						
						
						
						Also cleaned up `makeExample`s (changing most to `makeExcerpt`). 
						
						
					 
					
						2016-06-30 13:04:55 -07:00 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							705d8c50fd 
							
						 
					 
					
						
						
							
							docs(security): proofread prose, app now shows good and bad  
						
						... 
						
						
						
						- App now shows how Angular handles untrusted URLs and resources
- E2e test covered new functionality
- Copyedits to prose
- Updated provider expressions to use latest syntax
The original security feature tracker:
https://github.com/angular/angular/issues/8511  
						
						
					 
					
						2016-06-30 13:04:55 -07:00 
						 
				 
			
				
					
						
							
							
								Foxandxss 
							
						 
					 
					
						
						
						
						
							
						
						
							909f230cc7 
							
						 
					 
					
						
						
							
							update router to beta.1  
						
						
						
						
					 
					
						2016-06-30 13:04:04 -07:00 
						 
				 
			
				
					
						
							
							
								Filipe Silva 
							
						 
					 
					
						
						
						
						
							
						
						
							aa8ab52937 
							
						 
					 
					
						
						
							
							chore: update to rc.4  
						
						
						
						
					 
					
						2016-06-30 12:40:01 -07:00 
						 
				 
			
				
					
						
							
							
								Rex 
							
						 
					 
					
						
						
						
						
							
						
						
							fa9e83358c 
							
						 
					 
					
						
						
							
							review(toh-pt6): done.  
						
						
						
						
					 
					
						2016-06-30 20:35:04 +01:00 
						 
				 
			
				
					
						
							
							
								eltronix 
							
						 
					 
					
						
						
						
						
							
						
						
							19d2e4ef4c 
							
						 
					 
					
						
						
							
							Fixed typo  
						
						
						
						
					 
					
						2016-06-30 11:51:53 -07:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE (Rex) 
							
						 
					 
					
						
						
						
						
							
						
						
							43f400487e 
							
						 
					 
					
						
						
							
							docs(router): explicit explaination of terminal property  
						
						
						
						
					 
					
						2016-06-30 11:51:39 -07:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE (Rex) 
							
						 
					 
					
						
						
						
						
							
						
						
							1f883722c9 
							
						 
					 
					
						
						
							
							review(toh-pt6): line 243  
						
						
						
						
					 
					
						2016-06-30 17:08:34 +01:00