| 
							
							
								 Yang Lin | 2b3c8e5a64 | Polish forms.jade | 2016-11-26 03:16:06 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 74a2657e04 | 把小抄的历史版本加入版本控制中,以便识别改动 把小抄同步到最新版本 | 2016-11-25 23:00:01 +08:00 |  | 
			
				
					| 
							
							
								 rexebin | 754e11dc13 | fix styleguide | 2016-11-24 21:46:21 +00:00 |  | 
			
				
					| 
							
							
								 rexebin | d913092f99 | add addSpacingBetweenCnAndEn | 2016-11-24 20:42:38 +00:00 |  | 
			
				
					| 
							
							
								 Yang Lin | ebad4e1d1b | Fixes translate.js | 2016-11-25 01:15:27 +08:00 |  | 
			
				
					| 
							
							
								 Yang Lin | 24b9d7ab78 | merge 2.2.0 | 2016-11-23 00:46:50 +08:00 |  | 
			
				
					| 
							
							
								 Rex YE | 7f022c153b | fix aot-compiler, router and upgrade | 2016-11-22 15:21:36 +00:00 |  | 
			
				
					| 
							
							
								 Rex YE | b3555bf990 | fix browser-support, style-guide and toh-pt5 | 2016-11-22 14:54:35 +00:00 |  | 
			
				
					| 
							
							
								 Rex YE | 1e105bff95 | fix guide/index.jade and forms | 2016-11-22 14:42:12 +00:00 |  | 
			
				
					| 
							
							
								 Rex YE | a13b40442e | fix compile errors. | 2016-11-22 14:26:51 +00:00 |  | 
			
				
					| 
							
							
								 Yang Lin | 5a7745fb27 | Upgrade to 2.2.0 | 2016-11-22 20:07:16 +08:00 |  | 
			
				
					| 
							
							
								 Yang Lin | e16f317034 | Polish by review | 2016-11-21 00:48:26 +08:00 |  | 
			
				
					| 
							
							
								 Yang Lin | b8f0e41a37 | Polish guide architecture | 2016-11-09 02:01:43 +08:00 |  | 
			
				
					| 
							
							
								 Yang Lin | 9531ac9171 | Polish guide index | 2016-11-08 22:45:09 +08:00 |  | 
			
				
					| 
							
							
								 rexebin | 5c46ddf7a7 | Merge remote-tracking branch 'remotes/angular.io/master' into merge-review-rex # Conflicts:
#	public/_includes/_hero-home.jade | 2016-11-05 14:23:51 +00:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | 61a5a227b0 | merge: server-communication | 2016-11-04 16:12:31 +00:00 |  | 
			
				
					| 
							
							
								 Patrice Chalin | 40c646eced | chore: remove unnecessary bad-code-excerpt-skip-patterns (#2745) * chore: remove unnecessary bad-code-excerpt-skip-patterns
* chore(ts/style-guide): fix BAD FILENAME in code-tabs | 2016-11-04 14:40:21 +00:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | 93f08c3723 | minor fixes for dynamic forms, form-validation
upgrade | 2016-11-04 12:41:10 +00:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | e4c327c2d1 | translate: security.jade, new reworded part. | 2016-11-04 12:01:01 +00:00 |  | 
			
				
					| 
							
							
								 rexebin | de3b5cd6ce | translate: router - pre-loading... | 2016-11-03 22:44:27 +00:00 |  | 
			
				
					| 
							
							
								 rexebin | 85b0863bdd | fix minor issues with router.jade. | 2016-11-03 21:11:24 +00:00 |  | 
			
				
					| 
							
							
								 rexebin | ac2275dbe6 | fix: browser-support table. | 2016-11-03 21:02:08 +00:00 |  | 
			
				
					| 
							
							
								 rexebin | 0c72fbe444 | review: style-guide | 2016-11-03 20:53:31 +00:00 |  | 
			
				
					| 
							
							
								 rexebin | 47d646a080 | 补齐: template-syntax.jade | 2016-11-03 20:40:39 +00:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | f34e73eb8d | Patch: template-syntax's new contents. | 2016-11-03 18:12:44 +00:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | b1aae7f306 | fix template-syntax comments | 2016-11-03 16:54:53 +00:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | d398150573 | 翻译变更记录。 | 2016-11-03 16:41:27 +00:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | 23984f8caf | fix few compiling errors(live examples) | 2016-11-03 15:52:05 +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 |  | 
			
				
					| 
							
							
								 Zhimin YE | 2ba0cc70f7 | fix: #107 | 2016-11-01 10:07:23 +00:00 |  | 
			
				
					| 
							
							
								 Ward Bell | 8a3d061305 | docs(router): fix grammar typo in preloader section (#2700) tweaks some other related language. | 2016-10-31 01:17:27 -07:00 |  | 
			
				
					| 
							
							
								 Aristeidis Bampakos | 32f3ed973d | docs(router): Fix typos (#2666) | 2016-10-31 00:55:08 -07:00 |  | 
			
				
					| 
							
							
								 Ward Bell | 48cd008749 | docs(testing): 'testingService' -> 'twainService' plus clarity (#2692) | 2016-10-28 12:40:43 -07:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | b99ba401a1 | fix: #106 | 2016-10-28 10:22:35 +01:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | d44915f0a7 | first review: testing.jade is done. | 2016-10-26 16:52:34 +01:00 |  | 
			
				
					| 
							
							
								 Patrice Chalin | b1917b800f | chore: remove deprecated liveExample mixins (#2670) `+liveExample` mixins were replaced by `<live-example>` directives a
while ago. This cleanup fixes link issues to the plunker under ng2.io. | 2016-10-25 20:26:13 +01:00 |  | 
			
				
					| 
							
							
								 Jesús Rodríguez | b58e51a038 | docs(router): broken link to DI chapter (#2662) | 2016-10-25 19:52:44 +02:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | 4349c424d6 | review: testing 3549 | 2016-10-25 16:56:10 +01:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | 535161225b | review: testing 3543 | 2016-10-25 16:52:43 +01:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | fb75d67052 | review testing line 3480 | 2016-10-25 16:50:10 +01:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | 7893c42b53 | review: testin 3463 | 2016-10-25 16:49:13 +01:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | 0957c70caf | review testing 3239 | 2016-10-25 16:38:16 +01:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | de8efbaf4e | review testing. | 2016-10-25 16:14:07 +01:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | e139832320 | review testing | 2016-10-25 16:08:31 +01:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | 7b7487902c | review: testing | 2016-10-25 15:32:47 +01:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | d84a1b95dd | review testing | 2016-10-25 15:32:30 +01:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | c0cabddd69 | fix: routing | 2016-10-25 13:09:12 +01:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | 79e5dcc3c3 | Merge branch 'master' of https://github.com/angular/angular-cn | 2016-10-25 12:52:56 +01:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | ee9bae0112 | review testing | 2016-10-25 12:52:44 +01:00 |  | 
			
				
					| 
							
							
								 Rex | f64cf9c70a | Merge pull request #103 from Hongbo-Miao/patch-3 fix translation mistake | 2016-10-25 12:52:20 +01:00 |  |