Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							2a1c3626c5 
							
						 
					 
					
						
						
							
							去掉了大部分儿化音  
						
						... 
						
						
						
						感谢来自github的iloveyo123u1和Elderry 
						
						
					 
					
						2016-09-12 08:35:02 +08:00 
						 
				 
			
				
					
						
							
							
								Zhimin YE (Rex) 
							
						 
					 
					
						
						
						
						
							
						
						
							654030f09d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'remotes/angular.io/master'  
						
						... 
						
						
						
						# Conflicts:
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt2.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-08-23 14:02:54 +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 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							7075cdbefa 
							
						 
					 
					
						
						
							
							docs(hierarchical-di): post-RC5 Dart resync ( #2080 )  
						
						... 
						
						
						
						Contributes to #2077 .
Depends on #2078 . 
						
						
					 
					
						2016-08-11 14:43:59 -07:00 
						 
				 
			
				
					
						
							
							
								Peter Bacon Darwin 
							
						 
					 
					
						
						
						
						
							
						
						
							d79adb2422 
							
						 
					 
					
						
						
							
							docs(rc5): update docs and plunkers for rc5  
						
						
						
						
					 
					
						2016-08-09 11:48:07 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							28fe7d848f 
							
						 
					 
					
						
						
							
							把“作用范围”批量改为“作用域”  
						
						
						
						
					 
					
						2016-07-24 17:31:51 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							6264d3bcde 
							
						 
					 
					
						
						
							
							批量把Provider/provide改译为提供商/提供,以和ISP(互联网服务提供商)的译法看齐  
						
						
						
						
					 
					
						2016-07-07 08:22:36 +08: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 
							
						 
					 
					
						
						
						
						
							
						
						
							bc2e4b83c0 
							
						 
					 
					
						
						
							
							把所有全角括号改成了半角的  
						
						
						
						
					 
					
						2016-06-14 09:26:54 +08:00 
						 
				 
			
				
					
						
							
							
								Zhimin(Rex) YE 
							
						 
					 
					
						
						
						
						
							
						
						
							802da1f49f 
							
						 
					 
					
						
						
							
							hierarchical-dependency-injection.jade review is done.  
						
						
						
						
					 
					
						2016-06-02 23:04:09 +01:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							1fdb0c8df7 
							
						 
					 
					
						
						
							
							开发指南-层次化注入系统 翻译完毕  
						
						
						
						
					 
					
						2016-05-22 17:22:52 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							b84d92bb10 
							
						 
					 
					
						
						
							
							开发指南-层次化注入系统 刚刚开始翻译  
						
						
						
						
					 
					
						2016-05-21 20:48:55 +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 
						 
				 
			
				
					
						
							
							
								Aristeidis Bampakos 
							
						 
					 
					
						
						
						
						
							
						
						
							6a1e6e3bf6 
							
						 
					 
					
						
						
							
							docs(hierarchical-dependency-injection): Fixed typo  
						
						... 
						
						
						
						closes  #1345 
Fixed typo with the word "possibility" 
					
						2016-05-11 19:33:17 -07:00 
						 
				 
			
				
					
						
							
							
								Kyle Roberts 
							
						 
					 
					
						
						
						
						
							
						
						
							45b5053fed 
							
						 
					 
					
						
						
							
							docs(hierarchical DI): typos "it's" and add commas  
						
						... 
						
						
						
						closes  #1288  
					
						2016-05-10 20:24:08 -07:00 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							f30d71a3cc 
							
						 
					 
					
						
						
							
							docs(dev guide): cleanup of deprecated Jade mixin ( #1322 )  
						
						... 
						
						
						
						Replace uses of `liveExLinks` mixin and then deleted its definition. 
						
						
					 
					
						2016-05-09 21:13:50 +01:00 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							1e64d9e57a 
							
						 
					 
					
						
						
							
							docs(guide/dart): hierarchical-dependency-injection without copying  
						
						... 
						
						
						
						closes  #1207 
This uses a simpler way to render Dart prose from TS prose without
making a copy. This will make it _much_ easier to keep the two in sync. 
					
						2016-04-28 17:03:28 -07:00 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							11b6fefa7b 
							
						 
					 
					
						
						
							
							docs(guide/ts): hierarchical-dependency-injection copyedits  
						
						... 
						
						
						
						closes  #1146 
Copyedits found during creation of Dart version. 
					
						2016-04-23 14:26:36 -07:00 
						 
				 
			
				
					
						
							
							
								Michel Zimmer 
							
						 
					 
					
						
						
						
						
							
						
						
							81160bc399 
							
						 
					 
					
						
						
							
							docs(hierarchical-dependency-injection): fix typo: app/estore.service.ts -> app/restore.service.ts  
						
						... 
						
						
						
						closes  #800  
					
						2016-03-08 16:47:38 -08:00 
						 
				 
			
				
					
						
							
							
								Josh Otis 
							
						 
					 
					
						
						
						
						
							
						
						
							746a6649b2 
							
						 
					 
					
						
						
							
							chore: new flat left navigation panel (all language tracks)  
						
						
						
						
					 
					
						2016-03-03 04:51:52 -08:00 
						 
				 
			
				
					
						
							
							
								Patrick McDonald 
							
						 
					 
					
						
						
						
						
							
						
						
							28fb4ac161 
							
						 
					 
					
						
						
							
							docs: fix typos  
						
						... 
						
						
						
						closes  #900 
1. H in Hierarchical is not silent, so an is incorrect (a higher-archical rather than an eye-archical).
2. Missing we between Suppose & configured. 
					
						2016-02-29 13:11:29 -08:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							79d3d9f0ad 
							
						 
					 
					
						
						
							
							docs(samples): convert boot.ts -> main.ts  
						
						... 
						
						
						
						plus router text fix and missed beta.2 update to QS.js
closes  #773  
						
						
					 
					
						2016-01-28 17:32:38 -08:00 
						 
				 
			
				
					
						
							
							
								Peter Bacon Darwin 
							
						 
					 
					
						
						
						
						
							
						
						
							615a8d4147 
							
						 
					 
					
						
						
							
							docs(guide/hierarchical-injectors): fix typo  
						
						
						
						
					 
					
						2016-01-14 10:47:43 +00:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							b2cae850d8 
							
						 
					 
					
						
						
							
							docs(Hierarchical DI): code shuffle, text, & alpha52 updates  
						
						... 
						
						
						
						closes  #480  
					
						2015-12-12 09:41:40 -08:00 
						 
				 
			
				
					
						
							
							
								Christoph Burgdorf 
							
						 
					 
					
						
						
						
						
							
						
						
							4dffc41f3e 
							
						 
					 
					
						
						
							
							docs(hierarchical-injectors): use real example code  
						
						... 
						
						
						
						closes  #406 
With this change the chapter doesn't use inline
code anymore but instead uses proper runnable
example code. 
					
						2015-11-25 20:04:00 -08:00 
						 
				 
			
				
					
						
							
							
								Peter Bacon Darwin 
							
						 
					 
					
						
						
						
						
							
						
						
							1372a78fed 
							
						 
					 
					
						
						
							
							docs(guide/di): fix weird character that broke jade  
						
						
						
						
					 
					
						2015-11-11 11:23:11 +00:00 
						 
				 
			
				
					
						
							
							
								Peter Bacon Darwin 
							
						 
					 
					
						
						
						
						
							
						
						
							e86fde8dc9 
							
						 
					 
					
						
						
							
							chore(jade): upgrade to use marked filter  
						
						... 
						
						
						
						The `Transformers.markdown` (`:markdown`) filter is deprecated. This commit updates
the entire docs project to use the `jstransformer-marked` (`:marked') filter. 
						
						
					 
					
						2015-11-10 18:37:53 +00:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							d2706ca9ae 
							
						 
					 
					
						
						
							
							(docs) devguide-dependency-injection: new page and images added  
						
						
						
						
					 
					
						2015-10-19 12:00:09 +01:00