Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							2a1c3626c5 
							
						 
					 
					
						
						
							
							去掉了大部分儿化音  
						
						... 
						
						
						
						感谢来自github的iloveyo123u1和Elderry 
						
						
					 
					
						2016-09-12 08:35:02 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							ab06793705 
							
						 
					 
					
						
						
							
							对上次的合并查漏补缺  
						
						
						
						
					 
					
						2016-09-10 18:31:38 +08: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 
						 
				 
			
				
					
						
							
							
								Jesús Rodríguez 
							
						 
					 
					
						
						
						
						
							
						
						
							9f0ff2e2a9 
							
						 
					 
					
						
						
							
							docs(attribute-directives): add Renderer to style elements  
						
						... 
						
						
						
						closes  #2164  
					
						2016-08-24 23:47:41 -07:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE (Rex) 
							
						 
					 
					
						
						
						
						
							
						
						
							56b20ce877 
							
						 
					 
					
						
						
							
							review: patch up attribute-directives and server-communication.  
						
						
						
						
					 
					
						2016-08-16 12:31:47 +01:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							94aa3664ab 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						... 
						
						
						
						# Conflicts:
#	.gitignore
#	public/docs/_examples/cb-component-communication/ts/app/app.component.ts
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/glossary.jade
#	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/forms.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade 
						
						
					 
					
						2016-08-12 07:57:51 +08:00 
						 
				 
			
				
					
						
							
							
								Peter Bacon Darwin 
							
						 
					 
					
						
						
						
						
							
						
						
							d79adb2422 
							
						 
					 
					
						
						
							
							docs(rc5): update docs and plunkers for rc5  
						
						
						
						
					 
					
						2016-08-09 11:48:07 -07: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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							21fe9dc1d2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						... 
						
						
						
						# Conflicts:
#	README.md
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/testing/first-app-tests.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/news.jade 
						
						
					 
					
						2016-07-01 08:24:23 +08:00 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							e5b11d456c 
							
						 
					 
					
						
						
							
							docs(guide/attribute-directives): follow-up to  #1654  ( #1765 )  
						
						... 
						
						
						
						- Updated Dart code to match TS.
- Ran dartfmt.
- Enabled e2e tests; suites passed:
  - public/docs/_examples/attribute-directives/dart
  - public/docs/_examples/attribute-directives/ts
- Prose copyedits. 
						
						
					 
					
						2016-06-28 13:15:51 -07:00 
						 
				 
			
				
					
						
							
							
								Rex 
							
						 
					 
					
						
						
						
						
							
						
						
							dca575f617 
							
						 
					 
					
						
						
							
							attribute-directive.jade  review of "our" keyword.  
						
						
						
						
					 
					
						2016-06-20 15:45:29 +01:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							bc2e4b83c0 
							
						 
					 
					
						
						
							
							把所有全角括号改成了半角的  
						
						
						
						
					 
					
						2016-06-14 09:26:54 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							e338333e2f 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						... 
						
						
						
						# Conflicts:
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/guide/attribute-directives.jade 
						
						
					 
					
						2016-06-13 16:39:34 +08:00 
						 
				 
			
				
					
						
							
							
								Foxandxss 
							
						 
					 
					
						
						
						
						
							
						
						
							074a33a622 
							
						 
					 
					
						
						
							
							chore: tslint sweep done  
						
						
						
						
					 
					
						2016-06-13 02:40:28 +02:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE (Rex) 
							
						 
					 
					
						
						
						
						
							
						
						
							5f8583fcb0 
							
						 
					 
					
						
						
							
							attribute directives' review is done.  
						
						
						
						
					 
					
						2016-06-02 16:57:35 +01:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE (Rex) 
							
						 
					 
					
						
						
						
						
							
						
						
							5031e6fe94 
							
						 
					 
					
						
						
							
							started review for attribute-directives.jade.  
						
						
						
						
					 
					
						2016-05-26 17:04:19 +01:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							4699047cdd 
							
						 
					 
					
						
						
							
							修改一些BUG  
						
						
						
						
					 
					
						2016-05-25 07:38:57 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							cb756a5a05 
							
						 
					 
					
						
						
							
							统一了大量Attribute和Property的翻译  
						
						... 
						
						
						
						更新了小抄
调整了翻译样式 
						
						
					 
					
						2016-05-24 11:33:50 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							ae3b205c77 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						... 
						
						
						
						# Conflicts:
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/style-guide.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 
						
						
					 
					
						2016-05-21 21:02:15 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							d79eab8641 
							
						 
					 
					
						
						
							
							开发指南-组件样式 翻译完毕  
						
						... 
						
						
						
						文字微调 
						
						
					 
					
						2016-05-21 09:12:26 +08:00 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							6d2d52c588 
							
						 
					 
					
						
						
							
							docs(dart): cleanup 'live example' links ( #1449 )  
						
						... 
						
						
						
						This fixes various issues such as:
- missing space in Dart version between the live demo and demo source
links.
- Live example link directing to Plunker for Dart.
The main mixins (`liveExampleLink`*) used to support the generation of
links now assume reasonable default values for their arguments, and in
most cases the defaults are used.
* Dart example links: use http vs https
As agree to with @kwalrath. 
						
						
					 
					
						2016-05-20 16:18:58 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							aadbeb3ae9 
							
						 
					 
					
						
						
							
							修正一些合并中的问题  
						
						
						
						
					 
					
						2016-05-19 19:23:01 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							5f1f27e09c 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master'  
						
						... 
						
						
						
						# Conflicts:
#	public/_data.json
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/news.jade
#	public/resources/index.jade 
						
						
					 
					
						2016-05-19 13:33:02 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							ce4f1910d4 
							
						 
					 
					
						
						
							
							文字微调  
						
						
						
						
					 
					
						2016-05-19 10:06:06 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							2c2de03450 
							
						 
					 
					
						
						
							
							开发指南-Attribute指令 初译完毕  
						
						
						
						
					 
					
						2016-05-18 21:41:03 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							c750f28598 
							
						 
					 
					
						
						
							
							feature的翻译从特征改为特性  
						
						
						
						
					 
					
						2016-05-18 18:00:21 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							efa2450355 
							
						 
					 
					
						
						
							
							翻译了一部分Attribute型指令  
						
						
						
						
					 
					
						2016-05-18 17:01:12 +08:00 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							1c0218bc79 
							
						 
					 
					
						
						
							
							docs(dev guide): attribute-directives - move html excerpt to .html file ( #1313 )  
						
						... 
						
						
						
						Jade can’t parse inlined Angular adorned HTML properly, so it is best
to put such source in a file and include with `makeExample`. 
						
						
					 
					
						2016-05-06 18:18:48 +01:00 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							e958be24bf 
							
						 
					 
					
						
						
							
							docs(dev guide): attribute-directives - updated dart/ts code and new dart prose  
						
						... 
						
						
						
						Mainly copyedits and prep for extension
+ example code cleanup & bug fix
+ fix bug in default color initialization 
						
						
					 
					
						2016-05-06 15:42:01 +01:00 
						 
				 
			
				
					
						
							
							
								Foxandxss 
							
						 
					 
					
						
						
						
						
							
						
						
							596825a8b1 
							
						 
					 
					
						
						
							
							docs: update all docs to partially comply the style-guide  
						
						
						
						
					 
					
						2016-05-03 12:42:44 -06:00 
						 
				 
			
				
					
						
							
							
								Torgeir Helgevold 
							
						 
					 
					
						
						
						
						
							
						
						
							c1f2c397ff 
							
						 
					 
					
						
						
							
							docs: add DI cookbook  
						
						
						
						
					 
					
						2016-04-05 10:15:18 -07:00 
						 
				 
			
				
					
						
							
							
								Foxandxss 
							
						 
					 
					
						
						
						
						
							
						
						
							6ca1ac2c45 
							
						 
					 
					
						
						
							
							docs: instrucs for "download-and-go" development with quickstart source repo  
						
						
						
						
					 
					
						2016-03-14 12:44:25 -07:00 
						 
				 
			
				
					
						
							
							
								Foxandxss 
							
						 
					 
					
						
						
						
						
							
						
						
							b300d7b116 
							
						 
					 
					
						
						
							
							docs: add quickstart repository where needed  
						
						
						
						
					 
					
						2016-03-14 09:11:50 -07:00 
						 
				 
			
				
					
						
							
							
								Josh Otis 
							
						 
					 
					
						
						
						
						
							
						
						
							746a6649b2 
							
						 
					 
					
						
						
							
							chore: new flat left navigation panel (all language tracks)  
						
						
						
						
					 
					
						2016-03-03 04:51:52 -08:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							6e11cf6a1e 
							
						 
					 
					
						
						
							
							docs(attribute directives/TS/Dart): remove Renderer; improve text  
						
						... 
						
						
						
						closes  #757  
					
						2016-01-27 14:49:16 -08:00 
						 
				 
			
				
					
						
							
							
								Kion Stephen 
							
						 
					 
					
						
						
						
						
							
						
						
							7269d3481d 
							
						 
					 
					
						
						
							
							docs(attribute-directives): small fixes.  
						
						... 
						
						
						
						closes  #618  
					
						2016-01-03 15:39:17 -08:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							f4acc0ccbc 
							
						 
					 
					
						
						
							
							docs(tutorial): Part 3 improvements + input explanation  
						
						... 
						
						
						
						Updated Attribute Directives chapter with appendix on input properties
closes  #576  
						
						
					 
					
						2015-12-17 02:12:58 -08:00 
						 
				 
			
				
					
						
							
							
								John Oxley 
							
						 
					 
					
						
						
						
						
							
						
						
							912ed52f25 
							
						 
					 
					
						
						
							
							docs: Fixed minor typos in attribute-directives and user-input  
						
						... 
						
						
						
						closes  #556 
* user-input.jade 
					
						2015-12-16 18:42:48 -08:00 
						 
				 
			
				
					
						
							
							
								Filipe Silva 
							
						 
					 
					
						
						
						
						
							
						
						
							92f1690b73 
							
						 
					 
					
						
						
							
							docs(Structural Directives): new dev guide chapter  
						
						... 
						
						
						
						closes  #499  
					
						2015-12-14 10:08:32 -08:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							47d12c896f 
							
						 
					 
					
						
						
							
							docs(attribute-directives): code shuffle & alpha52 update  
						
						... 
						
						
						
						closes  #473  
					
						2015-12-12 09:29:17 -08:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							4d1571254b 
							
						 
					 
					
						
						
							
							docs(attribute-binding): bind to 2nd property, default-color  
						
						
						
						
					 
					
						2015-12-03 12:44:26 -08:00 
						 
				 
			
				
					
						
							
							
								Deborah Kurata 
							
						 
					 
					
						
						
						
						
							
						
						
							c9ea1e52c1 
							
						 
					 
					
						
						
							
							docs(attribute-directive): new chapter + dev-guide chapter shuffle  
						
						... 
						
						
						
						closes  #437  
					
						2015-12-02 19:01:27 -08:00