Kyle Roberts 
							
						 
					 
					
						
						
						
						
							
						
						
							335d20e834 
							
						 
					 
					
						
						
							
							docs(Npm Packages): grammar and capitalization consistency  
						
						... 
						
						
						
						closes  #1947  
					
						2016-07-25 10:12:18 -07:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							bede1db748 
							
						 
					 
					
						
						
							
							typo(animation) wrong documentation for states  
						
						... 
						
						
						
						closes  #1937  
					
						2016-07-25 10:01:30 -07:00 
						 
				 
			
				
					
						
							
							
								Tero Parviainen 
							
						 
					 
					
						
						
						
						
							
						
						
							0ae32e7adb 
							
						 
					 
					
						
						
							
							docs(upgrade): cover Angular 1.5 one-way data bindings  
						
						... 
						
						
						
						closes  #1090 , 1169 
					
						2016-07-25 09:58:41 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							5532c54ff7 
							
						 
					 
					
						
						
							
							翻译完了一部分新增英文内容  
						
						
						
						
					 
					
						2016-07-24 22:06:39 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							28fe7d848f 
							
						 
					 
					
						
						
							
							把“作用范围”批量改为“作用域”  
						
						
						
						
					 
					
						2016-07-24 17:31:51 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							4400deeef8 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						... 
						
						
						
						# Conflicts:
#	gulpfile.js
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/resources/js/controllers/resources-controller.js 
						
						
					 
					
						2016-07-24 17:27:48 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							c3b68a6c1b 
							
						 
					 
					
						
						
							
							采纳了几个来自社区的意见  
						
						
						
						
					 
					
						2016-07-22 20:51:32 +08:00 
						 
				 
			
				
					
						
							
							
								雪狼 
							
						 
					 
					
						
						
						
						
							
						
						
							6ef4a5c331 
							
						 
					 
					
						
						
							
							Merge pull request  #37  from dreamapplehappy/dreamapple-contribute  
						
						... 
						
						
						
						翻译的一点建议 
						
						
					 
					
						2016-07-22 20:40:48 +08:00 
						 
				 
			
				
					
						
							
							
								Kathy Walrath 
							
						 
					 
					
						
						
						
						
							
						
						
							66984d5fc8 
							
						 
					 
					
						
						
							
							Revert "Template Expression Operators Copy Edit "  
						
						... 
						
						
						
						This reverts commit d0811714d54cda1882f8287e095bf182ce39421d. 
						
						
					 
					
						2016-07-21 13:41:44 -07:00 
						 
				 
			
				
					
						
							
							
								sgmills365 
							
						 
					 
					
						
						
						
						
							
						
						
							14bd476d89 
							
						 
					 
					
						
						
							
							Added capital lettings to titles  
						
						
						
						
					 
					
						2016-07-21 00:42:18 -07:00 
						 
				 
			
				
					
						
							
							
								amandaegraham 
							
						 
					 
					
						
						
						
						
							
						
						
							d0811714d5 
							
						 
					 
					
						
						
							
							Template Expression Operators Copy Edit  
						
						... 
						
						
						
						Waterloo ENGL 210 J Student 
Changed order of text in pipe operator to introduce pipe operator 
Changed word choice/word location in pope operator 
Added : before examples to keep consistent 
						
						
					 
					
						2016-07-21 00:42:18 -07:00 
						 
				 
			
				
					
						
							
							
								amandaegraham 
							
						 
					 
					
						
						
						
						
							
						
						
							7e1dba64eb 
							
						 
					 
					
						
						
							
							Interpolation Copy Edit  
						
						
						
						
					 
					
						2016-07-21 00:42:18 -07:00 
						 
				 
			
				
					
						
							
							
								amandaegraham 
							
						 
					 
					
						
						
						
						
							
						
						
							e8642d4616 
							
						 
					 
					
						
						
							
							HTML Section Copy Edit  
						
						... 
						
						
						
						Waterloo ENGL 210J Student  
Line 44: Changed tense
Line 54: Changed wording of second sentence to not start with 'and'. Added DOM meaning (Document Object Model) 
						
						
					 
					
						2016-07-21 00:42:18 -07:00 
						 
				 
			
				
					
						
							
							
								Brandon Roberts 
							
						 
					 
					
						
						
						
						
							
						
						
							2e3f3e7fb1 
							
						 
					 
					
						
						
							
							docs(router): Minor dev guide fixes  
						
						... 
						
						
						
						closes  #1932  
					
						2016-07-19 22:15:21 -07:00 
						 
				 
			
				
					
						
							
							
								Brandon Roberts 
							
						 
					 
					
						
						
						
						
							
						
						
							f056a2d5d2 
							
						 
					 
					
						
						
							
							docs(router): Added content updates to developer guide  
						
						... 
						
						
						
						closes  #1905 
Added section for RouterLinkActive
Added section for global query params and fragments
Added section for RouterState
Added wildcard route to example configuration
Updated code samples
Renamed .guard files to .service
Renamed interfaces.ts to can-deactivate-guard.service.ts
Removed unused files 
					
						2016-07-18 15:21:09 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							7c2da09b21 
							
						 
					 
					
						
						
							
							语言微调  
						
						
						
						
					 
					
						2016-07-18 14:30:01 +08:00 
						 
				 
			
				
					
						
							
							
								dreamapple 
							
						 
					 
					
						
						
						
						
							
						
						
							2269c9f893 
							
						 
					 
					
						
						
							
							翻译的建议  
						
						
						
						
					 
					
						2016-07-18 10:50:36 +08:00 
						 
				 
			
				
					
						
							
							
								dreamapple 
							
						 
					 
					
						
						
						
						
							
						
						
							e72ae07927 
							
						 
					 
					
						
						
							
							翻译的建议  
						
						
						
						
					 
					
						2016-07-18 10:46:20 +08:00 
						 
				 
			
				
					
						
							
							
								dreamapple 
							
						 
					 
					
						
						
						
						
							
						
						
							a56b460e20 
							
						 
					 
					
						
						
							
							翻译的建议: "In practice"在文中翻译为"实际上"可能比"在实践中"要好理解.  
						
						
						
						
					 
					
						2016-07-18 10:38:00 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							1d107eafb3 
							
						 
					 
					
						
						
							
							翻译了一些合并时遗漏的内容  
						
						
						
						
					 
					
						2016-07-16 18:29:42 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							3e9394f62a 
							
						 
					 
					
						
						
							
							校对合并结果  
						
						
						
						
					 
					
						2016-07-16 17:47:55 +08:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE (Rex) 
							
						 
					 
					
						
						
						
						
							
						
						
							b2bd58c675 
							
						 
					 
					
						
						
							
							review of architecture.jade.  
						
						
						
						
					 
					
						2016-07-15 17:11:25 +01: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 
						 
				 
			
				
					
						
							
							
								Foxandxss 
							
						 
					 
					
						
						
						
						
							
						
						
							a8091f5b84 
							
						 
					 
					
						
						
							
							docs(style-guide): remove routing from TOC  
						
						... 
						
						
						
						closes  #1856  
					
						2016-07-14 14:19:48 -07:00 
						 
				 
			
				
					
						
							
							
								雪狼 
							
						 
					 
					
						
						
						
						
							
						
						
							657bf63bdf 
							
						 
					 
					
						
						
							
							Merge pull request  #34  from dreamapplehappy/dreamapple-contribute  
						
						... 
						
						
						
						翻译的一点修改: _logger修改为logger 
						
						
					 
					
						2016-07-14 16:51:12 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							221f00c8b7 
							
						 
					 
					
						
						
							
							根据Hongbo-Miao的建议修正了一些问题  
						
						
						
						
					 
					
						2016-07-14 16:48:52 +08:00 
						 
				 
			
				
					
						
							
							
								dreamapple 
							
						 
					 
					
						
						
						
						
							
						
						
							68e7149742 
							
						 
					 
					
						
						
							
							翻译的一点修改: _logger修改为logger  
						
						
						
						
					 
					
						2016-07-14 14:31:17 +08:00 
						 
				 
			
				
					
						
							
							
								Hongbo Miao 
							
						 
					 
					
						
						
						
						
							
						
						
							8b4aee3935 
							
						 
					 
					
						
						
							
							Update attribute-directives.jade  
						
						
						
						
					 
					
						2016-07-13 23:32:24 -04:00 
						 
				 
			
				
					
						
							
							
								Hongbo Miao 
							
						 
					 
					
						
						
						
						
							
						
						
							b4a194634c 
							
						 
					 
					
						
						
							
							add lost info back  
						
						
						
						
					 
					
						2016-07-13 23:30:40 -04: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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								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