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 
						 
				 
			
				
					
						
							
							
								Suguru Inatomi 
							
						 
					 
					
						
						
						
						
							
						
						
							5fd6ae3099 
							
						 
					 
					
						
						
							
							fix(docs): fix typo 'ngOnit' ( #2211 )  
						
						
						
						
					 
					
						2016-08-27 01:58:26 -07: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 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							f0daf5d238 
							
						 
					 
					
						
						
							
							docs(lifecycle-hooks): post-RC5 Dart resync ( #2141 )  
						
						... 
						
						
						
						* lifecycle-hooks: copy latest to cache
* docs(lifecycle-hooks): post-RC5 Dart resync
- TS prose: removed mention of `routerOnActivate` which no longer
exists in the new router.
- TS improvements to the sample code have also been propagated to the
Dart sample.
Contributes to #2077 .
E2E tests pass now.
* post-review updates 
						
						
					 
					
						2016-08-19 15:07:30 -07:00 
						 
				 
			
				
					
						
							
							
								Trotyl Yu 
							
						 
					 
					
						
						
						
						
							
						
						
							604e0a72e6 
							
						 
					 
					
						
						
							
							docs(lifecycle-hooks): Remove statements about router-deprecated hooks  
						
						... 
						
						
						
						closes  #2110 
The lifecycle-hooks provided by router-deprecated has already been removed in the router, the router now uses guards rather than lifecycle-hooks to achieve the same work. 
					
						2016-08-17 17:37:14 -07:00 
						 
				 
			
				
					
						
							
							
								Fredy Treboux 
							
						 
					 
					
						
						
						
						
							
						
						
							124a03ae09 
							
						 
					 
					
						
						
							
							docs(lifecycle-hooks): minor typo.  
						
						... 
						
						
						
						closes  #2045  
					
						2016-08-09 22:36:55 -07: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 
						 
				 
			
				
					
						
							
							
								priestch 
							
						 
					 
					
						
						
						
						
							
						
						
							b21c90c358 
							
						 
					 
					
						
						
							
							fix(doc): fix 404 problem of some api url  
						
						
						
						
					 
					
						2016-06-28 22:25:24 -07:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							d1db5bfb72 
							
						 
					 
					
						
						
							
							翻译了教程中的HTTP一章  
						
						
						
						
					 
					
						2016-06-17 23:13:23 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							bc2e4b83c0 
							
						 
					 
					
						
						
							
							把所有全角括号改成了半角的  
						
						
						
						
					 
					
						2016-06-14 09:26:54 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							0b8712d729 
							
						 
					 
					
						
						
							
							微调  
						
						
						
						
					 
					
						2016-06-11 12:08:02 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							f8fd5a1ebd 
							
						 
					 
					
						
						
							
							更明确了ngOnInit的触发时机:每个输入属性的ngOnChanges都完成首次触发之后。  
						
						
						
						
					 
					
						2016-06-11 11:28:16 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							164244d77a 
							
						 
					 
					
						
						
							
							修正了api的链接(仅中文版)  
						
						
						
						
					 
					
						2016-06-10 14:45:12 +08:00 
						 
				 
			
				
					
						
							
							
								Zhimin(Rex) YE 
							
						 
					 
					
						
						
						
						
							
						
						
							0e073bb214 
							
						 
					 
					
						
						
							
							review of lifecycle-hooks is done.  
						
						
						
						
					 
					
						2016-06-05 22:15:38 +01:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							bfc5c70349 
							
						 
					 
					
						
						
							
							cookbook - 组件相对路径 初译完毕  
						
						... 
						
						
						
						cookbook - 1 to 2 初译开始
其它微调 
						
						
					 
					
						2016-06-01 18:34:22 +08:00 
						 
				 
			
				
					
						
							
							
								Zhicheng Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							940d0d9c22 
							
						 
					 
					
						
						
							
							开发指南-生命周期钩子 翻译完毕  
						
						
						
						
					 
					
						2016-05-26 19:02:38 +08:00 
						 
				 
			
				
					
						
							
							
								Zhimin(Rex) YE 
							
						 
					 
					
						
						
						
						
							
						
						
							3195d8c7f1 
							
						 
					 
					
						
						
							
							更多生命周期钩子的翻译。  
						
						
						
						
					 
					
						2016-05-24 22:29:33 +01:00 
						 
				 
			
				
					
						
							
							
								Zhimin(Rex) YE 
							
						 
					 
					
						
						
						
						
							
						
						
							2821384bdf 
							
						 
					 
					
						
						
							
							started lifecycle-hooks translation.  
						
						
						
						
					 
					
						2016-05-23 22:27:46 +01: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 
						 
				 
			
				
					
						
							
							
								Patrice Chalin 
							
						 
					 
					
						
						
						
						
							
						
						
							ac92e77611 
							
						 
					 
					
						
						
							
							docs(dev guide): lifecycle-hooks - updated dart/ts code and new dart prose  
						
						... 
						
						
						
						Mainly copyedits, but also
- Dart .jade extends TS .jade file with minor overrides
- Significant update of example code (so it matches the ts example in its
appearance and behavior).
- Tweaks to Dart code.
- A few extra/corrected mixin definitions in `_util-fns.jade`. 
						
						
					 
					
						2016-05-06 14:17:34 +01:00 
						 
				 
			
				
					
						
							
							
								Foxandxss 
							
						 
					 
					
						
						
						
						
							
						
						
							596825a8b1 
							
						 
					 
					
						
						
							
							docs: update all docs to partially comply the style-guide  
						
						
						
						
					 
					
						2016-05-03 12:42:44 -06:00 
						 
				 
			
				
					
						
							
							
								Naomi Black 
							
						 
					 
					
						
						
						
						
							
						
						
							6d13db472a 
							
						 
					 
					
						
						
							
							chore(links): make links to API docs relative  
						
						
						
						
					 
					
						2016-04-19 17:44:38 -07:00 
						 
				 
			
				
					
						
							
							
								Ken Dale 
							
						 
					 
					
						
						
						
						
							
						
						
							205cc28f25 
							
						 
					 
					
						
						
							
							docs(lifecycle-hooks): change ngOnit references to ngOnInit  
						
						... 
						
						
						
						closes  #1084  
					
						2016-04-13 19:41:44 -07:00 
						 
				 
			
				
					
						
							
							
								Aristeidis Bampakos 
							
						 
					 
					
						
						
						
						
							
						
						
							2b714a3945 
							
						 
					 
					
						
						
							
							docs(lifecycle-hooks): Fixed missing ":marked" typo  
						
						... 
						
						
						
						closes  #1051  
					
						2016-04-06 10:09:34 -07:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							a2cb80330a 
							
						 
					 
					
						
						
							
							docs: update to beta-12  
						
						
						
						
					 
					
						2016-03-23 21:39:13 -07:00 
						 
				 
			
				
					
						
							
							
								joeeames 
							
						 
					 
					
						
						
						
						
							
						
						
							5b27178083 
							
						 
					 
					
						
						
							
							docs(pipes) clarify impure pipes; explain missing filter/orderBy pipes  
						
						... 
						
						
						
						adds flying-heroes example and its test
adds random-pipe example 
						
						
					 
					
						2016-03-23 00:02:04 -07:00 
						 
				 
			
				
					
						
							
							
								Filipe Silva 
							
						 
					 
					
						
						
						
						
							
						
						
							b5ea1d8f68 
							
						 
					 
					
						
						
							
							docs(lifecycle-hooks): add hook sections, revise sample, add DoCheck & tests  
						
						
						
						
					 
					
						2016-03-16 01:52:11 -07:00 
						 
				 
			
				
					
						
							
							
								Josh Otis 
							
						 
					 
					
						
						
						
						
							
						
						
							746a6649b2 
							
						 
					 
					
						
						
							
							chore: new flat left navigation panel (all language tracks)  
						
						
						
						
					 
					
						2016-03-03 04:51:52 -08:00 
						 
				 
			
				
					
						
							
							
								Peter Bacon Darwin 
							
						 
					 
					
						
						
						
						
							
						
						
							8501cbcfed 
							
						 
					 
					
						
						
							
							docs(guide/lifecycle_hooks): fix typo  
						
						
						
						
					 
					
						2016-01-13 09:41:16 +00:00 
						 
				 
			
				
					
						
							
							
								Ward Bell 
							
						 
					 
					
						
						
						
						
							
						
						
							1a98ef5844 
							
						 
					 
					
						
						
							
							docs(Lifecycle Hooks): new chapter  
						
						... 
						
						
						
						closes  #574  
					
						2015-12-16 18:10:59 -08:00