Phil 
							
						 
					 
					
						
						
						
						
							
						
						
							adb1b1d43b 
							
						 
					 
					
						
						
							
							fix some translation in tutorial  
						
						
						
						
					 
					
						2016-08-01 17:35:11 +08:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE (Rex) 
							
						 
					 
					
						
						
						
						
							
						
						
							60a06e51b9 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'angular.io/master'  
						
						... 
						
						
						
						# Conflicts:
#	README.md
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade 
						
						
					 
					
						2016-08-01 09:52:29 +01:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							3e1fe05f8a 
							
						 
					 
					
						
						
							
							校对  
						
						
						
						
					 
					
						2016-08-01 13:43:28 +08:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							4507589e26 
							
						 
					 
					
						
						
							
							docs(toh): add explanation for using the search box  
						
						... 
						
						
						
						closes  #2002  
					
						2016-07-29 12:44:20 -07:00 
						 
				 
			
				
					
						
							
							
								Gerard Sans 
							
						 
					 
					
						
						
						
						
							
						
						
							abd6febed5 
							
						 
					 
					
						
						
							
							docs(animation): fix typo! =O  
						
						... 
						
						
						
						closes  #1992  
					
						2016-07-29 08:37:31 -07:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							5ca22eed32 
							
						 
					 
					
						
						
							
							docs(architecture): rename missing library  
						
						
						
						
					 
					
						2016-07-29 08:31:31 -07:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE (Rex) 
							
						 
					 
					
						
						
						
						
							
						
						
							c650436be1 
							
						 
					 
					
						
						
							
							Fix :  #42  ES2105 -> ES2015  
						
						
						
						
					 
					
						2016-07-28 09:07:52 +01:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							7916ec4c8d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						... 
						
						
						
						# Conflicts:
#	public/docs/ts/latest/guide/animations.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/upgrade.jade 
						
						
					 
					
						2016-07-26 17:45:25 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							91eb1f6f45 
							
						 
					 
					
						
						
							
							校对  
						
						
						
						
					 
					
						2016-07-26 17:35:18 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							01d2494879 
							
						 
					 
					
						
						
							
							校对  
						
						
						
						
					 
					
						2016-07-26 17:34:04 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							9334c93401 
							
						 
					 
					
						
						
							
							做了初步的SEO  
						
						
						
						
					 
					
						2016-07-26 08:28:02 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							ed8b3cd9e0 
							
						 
					 
					
						
						
							
							微调  
						
						
						
						
					 
					
						2016-07-26 08:16:57 +08:00 
						 
				 
			
				
					
						
							
							
								Ignat Shining 
							
						 
					 
					
						
						
						
						
							
						
						
							fc1a9a6026 
							
						 
					 
					
						
						
							
							docs(dependency-injection): Clarify how TypeScript generates decorator metadata  
						
						... 
						
						
						
						closes  #1960  
					
						2016-07-25 10:40:56 -07:00 
						 
				 
			
				
					
						
							
							
								Kyle Roberts 
							
						 
					 
					
						
						
						
						
							
						
						
							ce8b94799c 
							
						 
					 
					
						
						
							
							docs(Router): remove duplicate "activated"  
						
						... 
						
						
						
						closes  #1957  
					
						2016-07-25 10:14:55 -07:00 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							3233fc4a76 
							
						 
					 
					
						
						
							
							翻译完了新增 部分  
						
						
						
						
					 
					
						2016-07-25 12:42:36 +08: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 
						 
				 
			
				
					
						
							
							
								Torgeir Helgevold 
							
						 
					 
					
						
						
						
						
							
						
						
							f00b96fab8 
							
						 
					 
					
						
						
							
							docs(toh-6): remove details about throw  
						
						
						
						
					 
					
						2016-07-19 22:48:55 -04:00 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							b4c92d9c9c 
							
						 
					 
					
						
						
							
							docs(toh-6/dart): quickfix to "BAD FILENAME" errors ( #1929 )  
						
						... 
						
						
						
						Exclude the new Observables section entirely for now. 
						
						
					 
					
						2016-07-19 15:30:42 -07:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							ce2e14e4ae 
							
						 
					 
					
						
						
							
							docs(toh-pt6): bind to a component method rather than a RxJS Subject  
						
						... 
						
						
						
						updated text accordingly 
						
						
					 
					
						2016-07-19 12:26:14 -07:00 
						 
				 
			
				
					
						
							
							
								Torgeir Helgevold 
							
						 
					 
					
						
						
						
						
							
						
						
							f50dff818a 
							
						 
					 
					
						
						
							
							docs(toh-pt6): add observables to HTTP tutorial chapter  
						
						... 
						
						
						
						closes  #1528  
					
						2016-07-18 23:12:44 -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 
						 
				 
			
				
					
						
							
							
								Benoit Lateltin 
							
						 
					 
					
						
						
						
						
							
						
						
							5bac678c60 
							
						 
					 
					
						
						
							
							docs(toh-pt5): fix typo in tutorial  
						
						... 
						
						
						
						closes  #1913  
					
						2016-07-18 11:10:19 -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) 
							
						 
					 
					
						
						
						
						
							
						
						
							82c7f49784 
							
						 
					 
					
						
						
							
							review: toh-pt5.jade  
						
						
						
						
					 
					
						2016-07-15 17:30:05 +01: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 
						 
				 
			
				
					
						
							
							
								Chris Grieger 
							
						 
					 
					
						
						
						
						
							
						
						
							08d051d2f6 
							
						 
					 
					
						
						
							
							docs(testing): refer to 'lite-server' instead of 'live-server'.  
						
						... 
						
						
						
						closes  #1737 
Since the QuickStart uses 'lite-server', this should also be used for
the testing guide. 
					
						2016-07-14 14:39:59 -07: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