rexebin 
							
						 
					 
					
						
						
						
						
							
						
						
							7ca9e1159e 
							
						 
					 
					
						
						
							
							review: first review of ngmodule.jade is done.  
						
						
						
						
					 
					
						2016-09-17 19:44:46 +01:00 
						 
				 
			
				
					
						
							
							
								rexebin 
							
						 
					 
					
						
						
						
						
							
						
						
							b9b5c7bd64 
							
						 
					 
					
						
						
							
							fix: 首页图标bug  
						
						... 
						
						
						
						review: ngmodule to line 1821 
						
						
					 
					
						2016-09-17 19:35:22 +01:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							d1987b183b 
							
						 
					 
					
						
						
							
							docs(di): remove InjectorMetadata mentions  
						
						
						
						
					 
					
						2016-09-13 09:41:38 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							40523db212 
							
						 
					 
					
						
						
							
							翻译完了《Angular模块》  
						
						
						
						
					 
					
						2016-09-10 18:01:58 +08:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							01b211193c 
							
						 
					 
					
						
						
							
							docs(browser-support): edits ( #2299 )  
						
						
						
						
					 
					
						2016-09-09 22:21:40 -04:00 
						 
				 
			
				
					
						
							
							
								Marc Laval 
							
						 
					 
					
						
						
						
						
							
						
						
							d4a641e553 
							
						 
					 
					
						
						
							
							docs(browser-support): document browser support and polyfills ( #2244 )  
						
						
						
						
					 
					
						2016-09-09 10:02:02 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							f9ed4402e4 
							
						 
					 
					
						
						
							
							翻译了一部分ngModule  
						
						... 
						
						
						
						更新README 
						
						
					 
					
						2016-09-09 20:49:37 +08:00 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							562e99463a 
							
						 
					 
					
						
						
							
							chore(cheatsheet): fix double banner issue ( #2293 )  
						
						... 
						
						
						
						Each page is designed to have a single banner; adjust the cheatsheet to
follow this convention. Also eliminate the article nested within the
`l-conent` div.
Propagated changes/cleanup to JS and Dart. 
						
						
					 
					
						2016-09-08 15:01:39 -07:00 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							3e69d83e68 
							
						 
					 
					
						
						
							
							chore(cheatsheet): use Jade to generate mirror page ( #2289 )  
						
						... 
						
						
						
						The page `docs/ts/latest/guide/cheatsheet.html` is a mirror of
`docs/ts/latest/cheatsheet.html`. Use Jade instead of Harp to create
the mirror so that jade2ng can generate the corresponding file. 
						
						
					 
					
						2016-09-08 13:37:22 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							969da7d321 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						... 
						
						
						
						# Conflicts:
#	README.md
#	public/_includes/_scripts-include.jade
#	public/docs/_examples/homepage-hello-world/ts/index.1.html
#	public/docs/_examples/homepage-tabs/ts/index.1.html
#	public/docs/_examples/homepage-todo/ts/index.1.html
#	public/docs/_examples/systemjs.config.plunker.build.js
#	public/docs/_examples/systemjs.config.plunker.js
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/component-relative-paths.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/ngmodule.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/_data.json
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/features.jade
#	public/resources/js/directives/live-example.js
#	tools/plunker-builder/indexHtmlTranslator.js 
						
						
					 
					
						2016-09-08 17:20:01 +08:00 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							15c50d76a2 
							
						 
					 
					
						
						
							
							docs(*): fix broken links in glossary and router chapter ( #2279 )  
						
						... 
						
						
						
						- Glossary: `#ecmascript=2015` is not a valid fragment.
- Router: `<a name=“…”>` needed to be `<a id=“…”>`. 
						
						
					 
					
						2016-09-07 16:48:43 -07:00 
						 
				 
			
				
					
						
							
							
								Kathy Walrath 
							
						 
					 
					
						
						
						
						
							
						
						
							3fa68cd7ac 
							
						 
					 
					
						
						
							
							docs(template-syntax): delete a single character  
						
						
						
						
					 
					
						2016-09-06 10:33:13 -07:00 
						 
				 
			
				
					
						
							
							
								Peter Fryer-Davis 
							
						 
					 
					
						
						
						
						
							
						
						
							32ac619fc7 
							
						 
					 
					
						
						
							
							Uwaterloo 210J pfryerda edits ( #1968 )  
						
						... 
						
						
						
						* template-syntax - removed word redundancies, consistent bolding rather than italics
* Some (not all) changes from PR.
* remaining changes from pull request 
						
						
					 
					
						2016-09-06 10:31:25 -07:00 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							59f6ebe849 
							
						 
					 
					
						
						
							
							docs(*): misc fixes to prose in support of jade2ng ( #2266 )  
						
						... 
						
						
						
						Fixes to prose “syntax”. Anomalies detected by jade2ng.
Also updated the main _utils-fn.jade in support of jade2ng as well. 
						
						
					 
					
						2016-09-06 10:28:24 -07:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							42257e4a22 
							
						 
					 
					
						
						
							
							docs(typescript): fix broken link ( #2263 )  
						
						
						
						
					 
					
						2016-09-03 13:55:10 -07:00 
						 
				 
			
				
					
						
							
							
								Patrice Delorme 
							
						 
					 
					
						
						
						
						
							
						
						
							1e0bd22d57 
							
						 
					 
					
						
						
							
							docs(DI): fixed Url of "Should I add providers to the root AppModule or the root AppComponent?"  
						
						... 
						
						
						
						closes  #2251 
Fixed url "Should I add providers to the root AppModule or the root AppComponent?" to proper link : NgModule to NgModule-FAQ 
					
						2016-09-03 12:08:41 -07:00 
						 
				 
			
				
					
						
							
							
								雪狼 
							
						 
					 
					
						
						
						
						
							
						
						
							8c6f6c173d 
							
						 
					 
					
						
						
							
							Merge pull request  #61  from supgeek-rod/patch-2  
						
						... 
						
						
						
						通过 useClass 来把 OldLogger 作为 NewLogger 的别名 
						
						
					 
					
						2016-09-02 03:28:33 -05:00