Zhimin YE 
							
						 
					 
					
						
						
						
						
							
						
						
							eb6eae8390 
							
						 
					 
					
						
						
							
							patch visual-studio  
						
						
						
						
					 
					
						2016-11-04 14:05:32 +00:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE 
							
						 
					 
					
						
						
						
						
							
						
						
							89d33384ff 
							
						 
					 
					
						
						
							
							sync visual-studio cookbook  
						
						
						
						
					 
					
						2016-11-04 13:27:00 +00:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE 
							
						 
					 
					
						
						
						
						
							
						
						
							93f08c3723 
							
						 
					 
					
						
						
							
							minor fixes for dynamic forms,  
						
						... 
						
						
						
						form-validation
upgrade 
						
						
					 
					
						2016-11-04 12:41:10 +00:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE 
							
						 
					 
					
						
						
						
						
							
						
						
							4578087fa5 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'remotes/angular.io/master'  
						
						... 
						
						
						
						# Conflicts:
#	README.md
#	harp.json
#	public/_includes/_hero-home.jade
#	public/docs/_examples/quickstart/ts/systemjs.config.1.js
#	public/docs/dart/latest/_util-fns.jade
#	public/docs/dart/latest/api/_data.json
#	public/docs/dart/latest/api/index.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/visual-studio-2015.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/change-log.jade
#	public/docs/ts/latest/guide/npm-packages.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/template-syntax.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
Server Communication and Visual studio 2015 require further merging. 
						
						
					 
					
						2016-11-03 15:38:23 +00:00 
						 
				 
			
				
					
						
							
							
								WilliamKoza 
							
						 
					 
					
						
						
						
						
							
						
						
							43c9071a2e 
							
						 
					 
					
						
						
							
							docs(cookbook): fix spelling error for word 'class' ( #2682 )  
						
						
						
						
					 
					
						2016-10-31 00:48:22 -07:00 
						 
				 
			
				
					
						
							
							
								Deborah Kurata 
							
						 
					 
					
						
						
						
						
							
						
						
							7d142c1d78 
							
						 
					 
					
						
						
							
							docs(vs2015): update for current tools. ( #2672 )  
						
						... 
						
						
						
						closes  #2672  
					
						2016-10-26 09:26:40 -07:00 
						 
				 
			
				
					
						
							
							
								Filipe Silva 
							
						 
					 
					
						
						
						
						
							
						
						
							0d49fecd30 
							
						 
					 
					
						
						
							
							chore: update to @types ( #1872 )  
						
						... 
						
						
						
						* chore: update examples to @types
* fix toh-6 aot and add types link 
						
						
					 
					
						2016-10-20 17:01:16 -07:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE 
							
						 
					 
					
						
						
						
						
							
						
						
							7808603489 
							
						 
					 
					
						
						
							
							translate: i18n done.  
						
						
						
						
					 
					
						2016-10-20 10:59:05 +01:00 
						 
				 
			
				
					
						
							
							
								Torgeir Helgevold 
							
						 
					 
					
						
						
						
						
							
						
						
							3eb7a41602 
							
						 
					 
					
						
						
							
							docs(aot-cb):bundle in-mem-web-api with esm and umd ( #2617 )  
						
						... 
						
						
						
						s
s 
						
						
					 
					
						2016-10-19 21:52:32 -07:00 
						 
				 
			
				
					
						
							
							
								rexebin 
							
						 
					 
					
						
						
						
						
							
						
						
							9bf733b940 
							
						 
					 
					
						
						
							
							translate: i18n - line 247  
						
						
						
						
					 
					
						2016-10-19 21:43:49 +01:00 
						 
				 
			
				
					
						
							
							
								rexebin 
							
						 
					 
					
						
						
						
						
							
						
						
							9129f46f45 
							
						 
					 
					
						
						
							
							translate: form-validation, done.  
						
						
						
						
					 
					
						2016-10-19 20:52:28 +01:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE 
							
						 
					 
					
						
						
						
						
							
						
						
							13a3074d6c 
							
						 
					 
					
						
						
							
							translate: form-validation to line 486  
						
						
						
						
					 
					
						2016-10-19 17:01:51 +01:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE 
							
						 
					 
					
						
						
						
						
							
						
						
							1a7773e9d6 
							
						 
					 
					
						
						
							
							translate: form-validation: line 89  
						
						
						
						
					 
					
						2016-10-18 22:40:53 +01:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE 
							
						 
					 
					
						
						
						
						
							
						
						
							b82cf0de4c 
							
						 
					 
					
						
						
							
							fix: ngmodule-faq  
						
						
						
						
					 
					
						2016-10-18 22:16:04 +01:00 
						 
				 
			
				
					
						
							
							
								rexebin 
							
						 
					 
					
						
						
						
						
							
						
						
							9d9b00b3b9 
							
						 
					 
					
						
						
							
							patch: ts-to-js, component-communication, set-document-title and visual-studio.  
						
						
						
						
					 
					
						2016-10-18 19:53:12 +01:00 
						 
				 
			
				
					
						
							
							
								rexebin 
							
						 
					 
					
						
						
						
						
							
						
						
							7a894d6434 
							
						 
					 
					
						
						
							
							patch up: ngmodule-faq  
						
						
						
						
					 
					
						2016-10-18 19:44:54 +01:00 
						 
				 
			
				
					
						
							
							
								rexebin 
							
						 
					 
					
						
						
						
						
							
						
						
							8202c332c2 
							
						 
					 
					
						
						
							
							fix: aot-compiler  
						
						
						
						
					 
					
						2016-10-18 19:24:18 +01:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE 
							
						 
					 
					
						
						
						
						
							
						
						
							ea61886279 
							
						 
					 
					
						
						
							
							fix: a1-a2-quick-ref  
						
						
						
						
					 
					
						2016-10-18 17:01:27 +01:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE 
							
						 
					 
					
						
						
						
						
							
						
						
							45b9e57b52 
							
						 
					 
					
						
						
							
							fix: aot-compiler  
						
						
						
						
					 
					
						2016-10-18 16:54:21 +01:00 
						 
				 
			
				
					
						
							
							
								Aristeidis Bampakos 
							
						 
					 
					
						
						
						
						
							
						
						
							3508b7988d 
							
						 
					 
					
						
						
							
							docs(cb-aot): fix typo in tab names. ( #2621 )  
						
						
						
						
					 
					
						2016-10-18 15:11:24 +02:00 
						 
				 
			
				
					
						
							
							
								rexebin 
							
						 
					 
					
						
						
						
						
							
						
						
							ce3930b2c0 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'remotes/angular.io/master'  
						
						... 
						
						
						
						# Conflicts:
#	harp.json
#	public/_includes/_hero-home.jade
#	public/_includes/_scripts-include.jade
#	public/docs/_examples/quickstart/js/package.1.json
#	public/docs/_includes/_side-nav.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/api/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/ngmodule-faq.jade
#	public/docs/ts/latest/cookbook/rc4-to-rc5.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/ngmodule.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/_data.json
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade 
						
						
					 
					
						2016-10-17 22:48:18 +01:00 
						 
				 
			
				
					
						
							
							
								Rex 
							
						 
					 
					
						
						
						
						
							
						
						
							abdb946d3b 
							
						 
					 
					
						
						
							
							fix :  #96  
						
						
						
						
					 
					
						2016-10-17 15:15:00 +01:00 
						 
				 
			
				
					
						
							
							
								Torgeir Helgevold 
							
						 
					 
					
						
						
						
						
							
						
						
							cdfe957ab8 
							
						 
					 
					
						
						
							
							docs(toh-6-aot): add aot to toh-6 ( #2496 )  
						
						... 
						
						
						
						* docs(toh-6-aot): add aot to toh-6
s
s
s
s
s
* docs(toh-6-aot): add aot to toh-6
* docs(toh-6-aot): make aot e2e tests run in the same project
Updates tooling for this purpose and also the prose. 
						
						
					 
					
						2016-10-12 01:44:49 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							7aa3c2320a 
							
						 
					 
					
						
						
							
							把立即加载统一改为主动加载  
						
						
						
						
					 
					
						2016-10-12 15:23:34 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							72b0ec623e 
							
						 
					 
					
						
						
							
							lazy-loading统一翻译为惰性加载  
						
						
						
						
					 
					
						2016-10-11 16:26:41 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							e1fd53b9b3 
							
						 
					 
					
						
						
							
							更正individual的翻译  
						
						
						
						
					 
					
						2016-10-06 20:48:24 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							41b0cc800b 
							
						 
					 
					
						
						
							
							更正了technically的翻译  
						
						
						
						
					 
					
						2016-10-06 20:37:42 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							78418f4d3c 
							
						 
					 
					
						
						
							
							调整additional的翻译  
						
						
						
						
					 
					
						2016-10-06 19:38:32 +08:00 
						 
				 
			
				
					
						
							
							
								Brandon 
							
						 
					 
					
						
						
						
						
							
						
						
							ff118810ff 
							
						 
					 
					
						
						
							
							docs(router): Updated routing examples to use routing modules ( #2478 )  
						
						... 
						
						
						
						Simplified routing in tutorial example
Updated ngmodule guide and ngmodule faq with routing module prose 
						
						
					 
					
						2016-10-05 14:59:09 -07:00 
						 
				 
			
				
					
						
							
							
								Filipe Silva 
							
						 
					 
					
						
						
						
						
							
						
						
							661c971778 
							
						 
					 
					
						
						
							
							fix(i18n): fix link and formatting error ( #2528 )  
						
						
						
						
					 
					
						2016-10-03 11:33:17 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							dca47cbb1a 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						... 
						
						
						
						# Conflicts:
#	public/docs/_examples/quickstart/ts/package.1.json
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/upgrade.jade 
						
						
					 
					
						2016-10-02 10:39:25 +08:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							9b083966f3 
							
						 
					 
					
						
						
							
							chore(i18n): fix broken plunker link ( #2519 )  
						
						
						
						
					 
					
						2016-09-30 23:05:50 -07:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							ba6b681ed4 
							
						 
					 
					
						
						
							
							docs(i18n): incorporate corrections and feedback from Victor Berchet ( #2517 )  
						
						... 
						
						
						
						See PR #2491  
						
						
					 
					
						2016-09-30 19:14:41 -07:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							66e3eca8eb 
							
						 
					 
					
						
						
							
							docs(rc4-to-rc5): change cleanup  
						
						... 
						
						
						
						closes  #2516  
					
						2016-09-30 17:14:55 -07:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							e6199a8dfb 
							
						 
					 
					
						
						
							
							docs(i18n): add internationalization (i18n) guide ( #2491 )  
						
						... 
						
						
						
						* docs(i18n): add internationalization (i18n) guide
* docs(cb-i18n): revamped to System.import the translation file 
						
						
					 
					
						2016-09-29 11:15:55 -07:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE (Rex) 
							
						 
					 
					
						
						
						
						
							
						
						
							a18aa9ec01 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'remotes/angular.io/master'  
						
						... 
						
						
						
						# Conflicts:
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade 
						
						
					 
					
						2016-09-26 15:14:39 +01:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							6def9505cc 
							
						 
					 
					
						
						
							
							chore: convert templateUrls to use moduleId where possible. ( #2477 )  
						
						
						
						
					 
					
						2016-09-25 18:51:54 -07:00 
						 
				 
			
				
					
						
							
							
								rexebin 
							
						 
					 
					
						
						
						
						
							
						
						
							f7c60a07df 
							
						 
					 
					
						
						
							
							fix: change all 他 > 它  
						
						
						
						
					 
					
						2016-09-25 19:50:45 +01:00 
						 
				 
			
				
					
						
							
							
								rexebin 
							
						 
					 
					
						
						
						
						
							
						
						
							a59b1b60ee 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'remotes/angular.io/master'  
						
						... 
						
						
						
						# Conflicts:
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/testing.jade 
						
						
					 
					
						2016-09-23 23:22:42 +01:00 
						 
				 
			
				
					
						
							
							
								rexebin 
							
						 
					 
					
						
						
						
						
							
						
						
							d9af771f8d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'remotes/angular.io/master'  
						
						... 
						
						
						
						# Conflicts:
#	README.md
#	public/contribute.jade
#	public/docs/_includes/_side-nav.jade
#	public/docs/_includes/_ts-temp.jade
#	public/docs/index.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/component-relative-paths.jade
#	public/docs/ts/latest/cookbook/index.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/cookbook/visual-studio-2015.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/animations.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/testing.jade
#	public/docs/ts/latest/guide/typescript-configuration.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/index.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/index.jade
#	public/support.jade 
						
						
					 
					
						2016-09-23 22:13:02 +01:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							b478aaf7a2 
							
						 
					 
					
						
						
							
							docs(testing): from Igor Minar feedback (Part 1) ( #2450 )  
						
						
						
						
					 
					
						2016-09-23 02:03:20 -07:00 
						 
				 
			
				
					
						
							
							
								Trotyl Yu 
							
						 
					 
					
						
						
						
						
							
						
						
							6bf7db584c 
							
						 
					 
					
						
						
							
							docs(vs2015): fix typo ( #2440 )  
						
						
						
						
					 
					
						2016-09-22 11:42:16 +02:00 
						 
				 
			
				
					
						
							
							
								Trotyl Yu 
							
						 
					 
					
						
						
						
						
							
						
						
							aab6d8c523 
							
						 
					 
					
						
						
							
							docs(vs2015): remove duplicated word ( #2441 )  
						
						
						
						
					 
					
						2016-09-22 11:40:35 +02:00 
						 
				 
			
				
					
						
							
							
								倪述荣 
							
						 
					 
					
						
						
						
						
							
						
						
							1f47f27c9e 
							
						 
					 
					
						
						
							
							修正一个笔误:重新编译  
						
						
						
						
					 
					
						2016-09-22 15:27:49 +08:00 
						 
				 
			
				
					
						
							
							
								Prashant Mahajan 
							
						 
					 
					
						
						
						
						
							
						
						
							36c7224ff9 
							
						 
					 
					
						
						
							
							Update visual-studio-2015.jade ( #2416 )  
						
						... 
						
						
						
						* Update visual-studio-2015.jade
In Step 7 (Build and Run App), there needs to be instruction to set index.html as start page, so that when Run button or F5 is pressed to run the application, browser shows index.html
* Update visual-studio-2015.jade 
						
						
					 
					
						2016-09-21 11:32:07 -07:00 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							0f99a7c130 
							
						 
					 
					
						
						
							
							docs(cookbook): don't use shredder on intro page ( #2418 )  
						
						... 
						
						
						
						Also added missing cookbook AoT chapter placeholders for JS and Dart,
fixing 404s mentioned in #2389 . 
						
						
					 
					
						2016-09-20 10:59:14 -07:00 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							693f6ae462 
							
						 
					 
					
						
						
							
							chore: rename Angular 2 to simply Angular ( #2402 )  
						
						
						
						
					 
					
						2016-09-19 20:24:40 -07:00 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							0c678c2355 
							
						 
					 
					
						
						
							
							docs: use Jade include rather than Harp partial ( #2392 )  
						
						... 
						
						
						
						No net effect on the generated docs.
Preparatory work for ng2.io. 
						
						
					 
					
						2016-09-19 20:08:03 -07:00 
						 
				 
			
				
					
						
							
							
								rexebin 
							
						 
					 
					
						
						
						
						
							
						
						
							de6b8d6ad0 
							
						 
					 
					
						
						
							
							review: ngmodule-faq, done.  
						
						
						
						
					 
					
						2016-09-18 22:32:25 +01:00 
						 
				 
			
				
					
						
							
							
								rexebin 
							
						 
					 
					
						
						
						
						
							
						
						
							b7568e4649 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/angular/angular-cn  
						
						
						
						
					 
					
						2016-09-18 18:46:39 +01:00