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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jesús Rodríguez
							
						 
					 | 
					
						
						
						
						
							
						
						
							693f6ae462
							
						
					 | 
					
						
						
							
							chore: rename Angular 2 to simply Angular (#2402)
						
						
						
						
						
						
					 | 
					
						2016-09-19 20:24:40 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							c648a4dd60
							
						
					 | 
					
						
						
							
							微调
						
						
						
						
						
						
					 | 
					
						2016-09-18 10:02:02 +08: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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							d034bc33c8
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
						
						# Conflicts:
#	public/contribute.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/component-relative-paths.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/forms.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/user-input.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade 
						
						
					 | 
					
						2016-08-06 19:52:08 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Peter Bacon Darwin
							
						 
					 | 
					
						
						
						
						
							
						
						
							9f03fca039
							
						
					 | 
					
						
						
							
							docs(cookbook): text following a node requires a dot
						
						
						
						
						
						
					 | 
					
						2016-08-06 07:45:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Brandon Roberts
							
						 
					 | 
					
						
						
						
						
							
						
						
							b93fb12fea
							
						
					 | 
					
						
						
							
							chore(examples): Updated live example links to use helper directive
						
						
						
						
						
						
						
						closes #2005 
						
						
					 | 
					
						2016-08-05 16:41:45 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin YE (Rex)
							
						 
					 | 
					
						
						
						
						
							
						
						
							0e14785cba
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'angular.io/master'
						
						
						
						
						
						
						
						# Conflicts:
#	README.md
#	public/_includes/_footer.jade
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/testing/first-app-tests.jade
#	public/docs/ts/latest/testing/jasmine-testing-101.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade 
						
						
					 | 
					
						2016-07-15 15:52:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Patrice Chalin
							
						 
					 | 
					
						
						
						
						
							
						
						
							98e5d4af77
							
						
					 | 
					
						
						
							
							docs(all): link cleanup - broken and outdated
						
						
						
						
						
						
						
						closes #1841
Fixes all broken links except genuine errors (see #1840), have been
resolved as of 2016-07-06
(https://github.com/angular/angular/commit/2708ce6a17667a2369c83bcf244c9
366b058d4c9).
Fixes #1574 
						
						
					 | 
					
						2016-07-11 21:50:07 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							6264d3bcde
							
						
					 | 
					
						
						
							
							批量把Provider/provide改译为提供商/提供,以和ISP(互联网服务提供商)的译法看齐
						
						
						
						
						
						
					 | 
					
						2016-07-07 08:22:36 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rex
							
						 
					 | 
					
						
						
						
						
							
						
						
							3659248ee5
							
						
					 | 
					
						
						
							
							continue review of "我们" keyword.
						
						
						
						
						
						
					 | 
					
						2016-06-20 12:29:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							bc2e4b83c0
							
						
					 | 
					
						
						
							
							把所有全角括号改成了半角的
						
						
						
						
						
						
					 | 
					
						2016-06-14 09:26:54 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin YE (Rex)
							
						 
					 | 
					
						
						
						
						
							
						
						
							72efc8f055
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'remotes/angular.io/master'
						
						
						
						
						
						
						
						# Conflicts:
#	README.md
#	public/contribute.jade
#	public/docs/_examples/cb-component-communication/e2e-spec.ts
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade 
						
						
					 | 
					
						2016-06-01 09:51:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vikash
							
						 
					 | 
					
						
						
						
						
							
						
						
							8569479423
							
						
					 | 
					
						
						
							
							docs: fix numerous typos in many doc files.
						
						
						
						
						
						
						
						closes #1509 
						
						
					 | 
					
						2016-06-01 01:08:56 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							335ac9d0a3
							
						
					 | 
					
						
						
							
							全部“烹饪书”改名为“烹饪宝典”
						
						
						
						
						
						
					 | 
					
						2016-05-22 19:26:23 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							8f01383b6c
							
						
					 | 
					
						
						
							
							烹饪书-依赖注入 二审完毕
						
						
						
						
						
						
						
						烹饪书-动态表单 二审完毕
烹饪书-设置文档标题 二审完毕 
						
						
					 | 
					
						2016-05-18 11:38:10 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							f50b34ad4f
							
						
					 | 
					
						
						
							
							烹饪书-依赖注入 二审中
						
						
						
						
						
						
					 | 
					
						2016-05-17 20:36:35 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							2368b8f4c3
							
						
					 | 
					
						
						
							
							文字微调
						
						
						
						
						
						
						
						食谱批量替换为菜谱 
						
						
					 | 
					
						2016-05-17 15:46:28 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							fd69ea3270
							
						
					 | 
					
						
						
							
							把部分expose统一译为暴露
						
						
						
						
						
						
					 | 
					
						2016-05-16 23:15:02 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin(Rex) YE
							
						 
					 | 
					
						
						
						
						
							
						
						
							8b8185b207
							
						
					 | 
					
						
						
							
							change voila, to get translation's original text working.
						
						
						
						
						
						
					 | 
					
						2016-05-15 23:03:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin(Rex) YE
							
						 
					 | 
					
						
						
						
						
							
						
						
							80c9768d84
							
						
					 | 
					
						
						
							
							first review of set-document-title.jade.
						
						
						
						
						
						
					 | 
					
						2016-05-15 23:00:09 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhicheng Wang
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0e75413c8
							
						
					 | 
					
						
						
							
							请看改成参见,更书面化。
						
						
						
						
						
						
						
						修订了一些词汇。 
						
						
					 | 
					
						2016-05-09 22:16:34 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Zhimin(Rex) YE
							
						 
					 | 
					
						
						
						
						
							
						
						
							ece8eda68c
							
						
					 | 
					
						
						
							
							set-document-title.jade draft translation is done.
						
						
						
						
						
						
					 | 
					
						2016-05-07 18:20:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Foxandxss
							
						 
					 | 
					
						
						
						
						
							
						
						
							66764fec7e
							
						
					 | 
					
						
						
							
							docs: fix a few typos
						
						
						
						
						
						
						
						closes #1239 
						
						
					 | 
					
						2016-05-01 16:17:05 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Naomi Black
							
						 
					 | 
					
						
						
						
						
							
						
						
							097505b4e8
							
						
					 | 
					
						
						
							
							docs(title): update a parenthetical comment in the title cookbook
						
						
						
						
						
						
					 | 
					
						2016-04-26 10:55:31 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ben Nadel
							
						 
					 | 
					
						
						
						
						
							
						
						
							c9d405062d
							
						
					 | 
					
						
						
							
							docs(cb-set-document-title): new "Set Title" cookbook chapter
						
						
						
						
						
						
						
						closes #1069 
						
						
					 | 
					
						2016-04-23 14:56:56 -07:00 | 
					
					
						
						
							
							
							
						
					 |