Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							ba3152bb88 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						... 
						
						
						
						# Conflicts:
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/guide/style-guide.jade 
						
						
					 
					
						2016-09-17 12:01:41 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							6f6f89ed9c 
							
						 
					 
					
						
						
							
							把所有“内建”改为“内置”  
						
						
						
						
					 
					
						2016-09-17 11:46:17 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							50f73986be 
							
						 
					 
					
						
						
							
							翻译完了NgModule FAQ  
						
						... 
						
						
						
						少量错别字修改 
						
						
					 
					
						2016-09-17 11:45:56 +08:00 
						 
				 
			
				
					
						
							
							
								Alex Wolfe 
							
						 
					 
					
						
						
						
						
							
						
						
							e2ec60d8dd 
							
						 
					 
					
						
						
							
							udpate colors and contrast for accessibility improvements  
						
						
						
						
					 
					
						2016-09-16 15:58:20 -07:00 
						 
				 
			
				
					
						
							
							
								Pete Bacon Darwin 
							
						 
					 
					
						
						
						
						
							
						
						
							c787fd2ff0 
							
						 
					 
					
						
						
							
							docs(testing-guide): fix tiny typo ( #2381 )  
						
						
						
						
					 
					
						2016-09-16 23:41:49 +02:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE (Rex) 
							
						 
					 
					
						
						
						
						
							
						
						
							79ca5433f5 
							
						 
					 
					
						
						
							
							review: ngmodule(line 1672)  
						
						
						
						
					 
					
						2016-09-16 17:01:51 +01:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							0db676a23c 
							
						 
					 
					
						
						
							
							翻译了一部分NgModule FAQ  
						
						
						
						
					 
					
						2016-09-16 20:45:50 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							b2fcb1a2e6 
							
						 
					 
					
						
						
							
							翻译完了AoT compiler  
						
						
						
						
					 
					
						2016-09-16 18:13:42 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							9a2aa3cc7d 
							
						 
					 
					
						
						
							
							找回一些丢失的翻译  
						
						
						
						
					 
					
						2016-09-16 16:01:59 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							96bfb764a1 
							
						 
					 
					
						
						
							
							翻译了一部分未翻译的合并  
						
						
						
						
					 
					
						2016-09-16 15:50:21 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							bd29d09085 
							
						 
					 
					
						
						
							
							翻译了一部分未翻译的合并  
						
						
						
						
					 
					
						2016-09-16 13:21:27 +08:00 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							f0ff5e26bd 
							
						 
					 
					
						
						
							
							docs(style-guide): attributes aren't comma separated ( #2372 )  
						
						... 
						
						
						
						A fix necessary for ng2.io 
						
						
					 
					
						2016-09-15 17:18:41 -07:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE (Rex) 
							
						 
					 
					
						
						
						
						
							
						
						
							35a1cce5dc 
							
						 
					 
					
						
						
							
							review: ngmodule.jade to line 700  
						
						
						
						
					 
					
						2016-09-15 16:56:39 +01:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							e693d35fb1 
							
						 
					 
					
						
						
							
							合并了最新更新,翻译了官方的发布声明  
						
						
						
						
					 
					
						2016-09-15 17:08:17 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							2417245114 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						... 
						
						
						
						# Conflicts:
#	public/_data.json
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/_includes/_hero.jade
#	public/_includes/_main-nav.jade
#	public/_includes/_util-fns.jade
#	public/docs/_includes/_side-nav.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/animations.jade
#	public/docs/ts/latest/guide/ngmodule.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/testing/_data.json
#	public/docs/ts/latest/testing/application-under-test.jade
#	public/docs/ts/latest/testing/first-app-tests.jade
#	public/docs/ts/latest/testing/index.jade
#	public/docs/ts/latest/testing/jasmine-testing-101.jade
#	public/docs/ts/latest/testing/testing-an-angular-pipe.jade
#	public/index.jade
#	public/resources/css/main.scss
#	public/resources/css/module/_side-nav.scss 
						
						
					 
					
						2016-09-15 15:23:48 +08:00 
						 
				 
			
				
					
						
							
							
								Filipe Silva 
							
						 
					 
					
						
						
						
						
							
						
						
							24c61dd7bc 
							
						 
					 
					
						
						
							
							chore: here we are ( #2353 )  
						
						
						
						
					 
					
						2016-09-15 02:41:19 +01:00 
						 
				 
			
				
					
						
							
							
								Naomi Black 
							
						 
					 
					
						
						
						
						
							
						
						
							095a36f903 
							
						 
					 
					
						
						
							
							docs(refresh): late bio add and livestream banner  
						
						
						
						
					 
					
						2016-09-14 18:27:02 -07:00 
						 
				 
			
				
					
						
							
							
								Alex Wolfe 
							
						 
					 
					
						
						
						
						
							
						
						
							65db6b9268 
							
						 
					 
					
						
						
							
							design(style): Restyle changes from Alex  
						
						
						
						
					 
					
						2016-09-14 17:18:55 -07:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							d64cb11635 
							
						 
					 
					
						
						
							
							docs(aot): remove typescript instruction  
						
						
						
						
					 
					
						2016-09-14 14:49:25 -07:00 
						 
				 
			
				
					
						
							
							
								Naomi Black 
							
						 
					 
					
						
						
						
						
							
						
						
							053ecc2b10 
							
						 
					 
					
						
						
							
							docs(aot): More consistency edits to aot/jit  
						
						
						
						
					 
					
						2016-09-14 13:55:23 -07:00 
						 
				 
			
				
					
						
							
							
								Brandon Roberts 
							
						 
					 
					
						
						
						
						
							
						
						
							c15a68e591 
							
						 
					 
					
						
						
							
							docs(router): Added and organized more router dev guide content  
						
						... 
						
						
						
						Moved all heroes functionality into milestone 2
Crisis Center initial functionality is milestone 3
Admin feature module as milestone 4 including route guard examples
Updated milestone 5 to lazy load admin feature module
Added examples for CanLoad, CanActivateChildren guard, component-less routes
Added section on explanation of ActivatedRoute
Added section on animating route components
Added section on relative navigation 
						
						
					 
					
						2016-09-14 13:46:16 -07:00 
						 
				 
			
				
					
						
							
							
								Kapunahele Wong 
							
						 
					 
					
						
						
						
						
							
						
						
							4d46d7c1e4 
							
						 
					 
					
						
						
							
							docs(glossary): copy edit  
						
						... 
						
						
						
						See #2292  for review history.
closes  #2292  
						
						
					 
					
						2016-09-14 13:38:20 -07:00 
						 
				 
			
				
					
						
							
							
								Naomi Black 
							
						 
					 
					
						
						
						
						
							
						
						
							bc804322c4 
							
						 
					 
					
						
						
							
							docs(aot): update nav to be consistent with aot hyphenation  
						
						
						
						
					 
					
						2016-09-14 10:55:46 -07:00 
						 
				 
			
				
					
						
							
							
								Torgeir Helgevold 
							
						 
					 
					
						
						
						
						
							
						
						
							6813ced018 
							
						 
					 
					
						
						
							
							docs(cookbook - aot compiler) ( #2161 )  
						
						... 
						
						
						
						docs(cb-aot-compiler): new cookbook on AoT compiler 
						
						
					 
					
						2016-09-14 10:10:04 -07:00 
						 
				 
			
				
					
						
							
							
								Kapunahele Wong 
							
						 
					 
					
						
						
						
						
							
						
						
							97736ad5ee 
							
						 
					 
					
						
						
							
							Security Edits Combined ( #2245 )  
						
						... 
						
						
						
						* Security Edits Combined
* Security copy edits
* Fix typo in security
* fixing trailing whitespace 
						
						
					 
					
						2016-09-14 09:11:53 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							551f3dd51a 
							
						 
					 
					
						
						
							
							更新了cheatsheet  
						
						... 
						
						
						
						翻译了一部分FAQ 
						
						
					 
					
						2016-09-14 21:12:14 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							f5a154e012 
							
						 
					 
					
						
						
							
							文字微调  
						
						
						
						
					 
					
						2016-09-14 13:49:54 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							e71848b664 
							
						 
					 
					
						
						
							
							翻译完了浏览器支持  
						
						
						
						
					 
					
						2016-09-14 13:12:05 +08:00 
						 
				 
			
				
					
						
							
							
								Benjamin Dopplinger 
							
						 
					 
					
						
						
						
						
							
						
						
							d858ed379a 
							
						 
					 
					
						
						
							
							docs(server-communication): fix "app/app.module.ts" typo  
						
						... 
						
						
						
						closes  #2283  
					
						2016-09-13 20:52:26 -07:00 
						 
				 
			
				
					
						
							
							
								Deborah Kurata 
							
						 
					 
					
						
						
						
						
							
						
						
							a52d8c3e76 
							
						 
					 
					
						
						
							
							docs(validation): Change to 'Table of Contents'  
						
						... 
						
						
						
						Same change to NgModules
closes  #2315  
						
						
					 
					
						2016-09-13 20:46:36 -07:00 
						 
				 
			
				
					
						
							
							
								John Papa 
							
						 
					 
					
						
						
						
						
							
						
						
							39c5a2b949 
							
						 
					 
					
						
						
							
							Rc5 doc sweep ( #2218 )  
						
						... 
						
						
						
						* Removed 03-05, 04-12, 04-15.
Removed style for whitespace in imports.
Removed + sign prefix for routing folders. Updated all code.
Removed style that said to use lazy loading.  There was no value in the style other than use it :)
* renamed componet router to router 
						
						
					 
					
						2016-09-13 18:51:03 -07:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							1fb488b4ec 
							
						 
					 
					
						
						
							
							docs: delete forms- and router-deprecated, jade + examples ( #2328 )  
						
						
						
						
					 
					
						2016-09-13 18:49:51 -07:00 
						 
				 
			
				
					
						
							
							
								Jonathan Persson 
							
						 
					 
					
						
						
						
						
							
						
						
							f2b1bbaba9 
							
						 
					 
					
						
						
							
							Remove a superfluous . in HTTP client docs  😄  ( #2313 )  
						
						
						
						
					 
					
						2016-09-13 16:13:44 -07:00 
						 
				 
			
				
					
						
							
							
								Shai Reznik 
							
						 
					 
					
						
						
						
						
							
						
						
							3c9ff061c6 
							
						 
					 
					
						
						
							
							docs(server-communication): fix small typo ( #2312 )  
						
						
						
						
					 
					
						2016-09-13 15:58:39 -07:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							08ae41019e 
							
						 
					 
					
						
						
							
							docs(animation): add callbacks documentation ( #2271 )  
						
						
						
						
					 
					
						2016-09-13 15:57:58 -07:00 
						 
				 
			
				
					
						
							
							
								Kapunahele Wong 
							
						 
					 
					
						
						
						
						
							
						
						
							c5a1a88042 
							
						 
					 
					
						
						
							
							a1-a2 quick ref copy edits ( #2255 )  
						
						... 
						
						
						
						* a1-a2 quick ref copy edits
* copy edits, 2nd pass
* Glossary Edits
* 1-2 quick ref copy edits, pass 2 
						
						
					 
					
						2016-09-13 14:56:29 -07:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							07cfce795f 
							
						 
					 
					
						
						
							
							docs(testing): testing chapter and samples for RC6 ( #2198 )  
						
						... 
						
						
						
						[WIP] docs(testing): new chapter, new samples 
						
						
					 
					
						2016-09-13 14:39:39 -07:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							c5ad38ee86 
							
						 
					 
					
						
						
							
							docs(ngmodule-faq): eager loaded Routed Feature Module must be imported ( #2304 )  
						
						... 
						
						
						
						fixes  #2298  
					
						2016-09-13 12:27:27 -07:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							98e5bc248e 
							
						 
					 
					
						
						
							
							docs(ngmodule-faq): fix plunker link ( #2277 )  
						
						
						
						
					 
					
						2016-09-13 12:27:13 -07:00 
						 
				 
			
				
					
						
							
							
								jmcgoldrick 
							
						 
					 
					
						
						
						
						
							
						
						
							e1b2f6a2fe 
							
						 
					 
					
						
						
							
							docs(ngmodule-faq): correct BrowserModule import module ( #2269 )  
						
						
						
						
					 
					
						2016-09-13 12:24:59 -07:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							d1987b183b 
							
						 
					 
					
						
						
							
							docs(di): remove InjectorMetadata mentions  
						
						
						
						
					 
					
						2016-09-13 09:41:38 -07:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							988694bb12 
							
						 
					 
					
						
						
							
							chore: update docs to rc7  
						
						
						
						
					 
					
						2016-09-13 08:48:45 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							2a1c3626c5 
							
						 
					 
					
						
						
							
							去掉了大部分儿化音  
						
						... 
						
						
						
						感谢来自github的iloveyo123u1和Elderry 
						
						
					 
					
						2016-09-12 08:35:02 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							67052ac925 
							
						 
					 
					
						
						
							
							fix: 英文不自动隐藏  
						
						... 
						
						
						
						#50  
					
						2016-09-12 08:18:24 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							d86f25f9d0 
							
						 
					 
					
						
						
							
							更正github aruis指出的问题  
						
						
						
						
					 
					
						2016-09-12 08:06:01 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							3d40a26655 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						... 
						
						
						
						# Conflicts:
#	README.md
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cheatsheet.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/quickstart.jade 
						
						
					 
					
						2016-09-11 21:20:58 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							1a45c1f8fc 
							
						 
					 
					
						
						
							
							更正中文社区的阿泽指出的错误  
						
						
						
						
					 
					
						2016-09-11 09:35:54 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							8a7165acf5 
							
						 
					 
					
						
						
							
							对上次的合并查漏补缺  
						
						
						
						
					 
					
						2016-09-10 20:44:57 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							ab06793705 
							
						 
					 
					
						
						
							
							对上次的合并查漏补缺  
						
						
						
						
					 
					
						2016-09-10 18:31:38 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							446acfd81b 
							
						 
					 
					
						
						
							
							对上次的合并查漏补缺  
						
						
						
						
					 
					
						2016-09-10 18:07:25 +08:00