| 
							
							
								 Zhimin YE | ac674f009b | review: testing 2750 | 2016-10-25 10:35:58 +01:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | a4d66dfc07 | review testing 2644 | 2016-10-25 10:26:30 +01:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | f6598097c8 | Merge branch 'master' of https://github.com/angular/angular-cn | 2016-10-25 10:12:31 +01:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | 860334177b | review tesing | 2016-10-25 10:12:28 +01:00 |  | 
			
				
					| 
							
							
								 Hongbo Miao | 60101cc797 | fix translation mistake | 2016-10-24 22:24:15 -04:00 |  | 
			
				
					| 
							
							
								 Hongbo Miao | 804206ca87 | fix translation mistake | 2016-10-24 20:04:47 -04:00 |  | 
			
				
					| 
							
							
								 rexebin | 50ad8c189a | review: to line 2494 | 2016-10-24 22:32:17 +01:00 |  | 
			
				
					| 
							
							
								 rexebin | aa2d4e629f | review: testing. | 2016-10-24 22:20:42 +01:00 |  | 
			
				
					| 
							
							
								 rexebin | f500220488 | fix: testing | 2016-10-24 21:43:04 +01:00 |  | 
			
				
					| 
							
							
								 rexebin | 368193ba34 | fix: testing.jade table. | 2016-10-24 21:00:17 +01:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | 3de420bf48 | review | 2016-10-24 15:03:23 +01:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | 8aa8c11697 | review: tesing. | 2016-10-24 14:55:43 +01:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | 3697cedeaa | review: 一些测试->测试程序 | 2016-10-24 12:58:39 +01:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | 92b666658c | Merge branch 'master' of https://github.com/angular/angular-cn | 2016-10-24 12:10:56 +01:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | 865a0934bd | review: testing.jade | 2016-10-24 12:10:45 +01:00 |  | 
			
				
					| 
							
							
								 Ward Bell | ea7dff4d89 | docs(security): improve xsrf description and add it to http chapter as well (#2652) | 2016-10-24 02:57:19 -07:00 |  | 
			
				
					| 
							
							
								 yinyong02 | 3575677f5a | Fixed typo | 2016-10-24 09:35:09 +08:00 |  | 
			
				
					| 
							
							
								 Jesús Rodríguez | bfd08c08c5 | docs(animation): add note about aliases (#2629) | 2016-10-22 20:35:12 +02:00 |  | 
			
				
					| 
							
							
								 Filipe Silva | 4c85f0a91d | chore: update to 2.1.1 (#2650) | 2016-10-21 22:31:09 +01:00 |  | 
			
				
					| 
							
							
								 Ward Bell | 14c01fb651 | docs(change-log): notes in-mem-web-api breaking change (#2644) | 2016-10-20 19:28:19 -07:00 |  | 
			
				
					| 
							
							
								 Ward Bell | 82933bad47 | docs(change-log): update for move to @typings (#2643) | 2016-10-20 17:24:50 -07:00 |  | 
			
				
					| 
							
							
								 Filipe Silva | 0d49fecd30 | chore: update to @types (#1872) * chore: update examples to @types
* fix toh-6 aot and add types link | 2016-10-20 17:01:16 -07:00 |  | 
			
				
					| 
							
							
								 Ward Bell | 870ce124d2 | docs(template-syntax): explain basic two-way binding (#2639) closes issue #2598 | 2016-10-20 10:56:17 -07:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | 03cb1c5689 | translate: change-log done | 2016-10-20 11:50:10 +01:00 |  | 
			
				
					| 
							
							
								 leiermeng | 63bac4eba5 | fix: guide/router some error | 2016-10-20 14:50:54 +08:00 |  | 
			
				
					| 
							
							
								 Ward Bell | 101265cba4 | chore(testing): fix broken input/output link (#2638) | 2016-10-19 23:29:06 -07:00 |  | 
			
				
					| 
							
							
								 Ward Bell | c28b003a3c | docs(HTTP Client): edit copy to conform to G-doc guidelines. (#2630) | 2016-10-19 23:17:50 -07:00 |  | 
			
				
					| 
							
							
								 Brandon | 2f5306f1b6 | docs(router): Added example of feature module pre-loading (#2595) * added example of feature module pre-loading
* added transition aliases for route animations | 2016-10-19 22:02:47 -07:00 |  | 
			
				
					| 
							
							
								 rexebin | f8b80ad3e5 | translate: testing is done. | 2016-10-18 21:48:48 +01:00 |  | 
			
				
					| 
							
							
								 SangKa | 5774909946 | (测试一章):修复错别字 | 2016-10-18 22:05:23 +08:00 |  | 
			
				
					| 
							
							
								 SangKa | 232196e6b2 | (测试一章):文字优化 消除歧义 | 2016-10-18 22:04:52 +08:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | 0741e1f058 | fix: upgrade example | 2016-10-18 15:00:32 +01:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | abb21017c2 | Merge branch 'master' of https://github.com/angular/angular-cn | 2016-10-18 14:58:02 +01:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | 183633b0e3 | fix: router and testing | 2016-10-18 14:57:39 +01:00 |  | 
			
				
					| 
							
							
								 Mark Pieszak | fdc1b0490c | docs(server-communication): grammar fix (#2626) | 2016-10-18 15:49:35 +02:00 |  | 
			
				
					| 
							
							
								 Maurice de Beijer | 6ece848443 | docs(testing): fix broken links (#2624) | 2016-10-18 15:17:14 +02:00 |  | 
			
				
					| 
							
							
								 SangKa.Z | 4f15b4ebdc | docs(testing): fix hash link (#2609) | 2016-10-18 15:07:37 +02:00 |  | 
			
				
					| 
							
							
								 Timothy Curchod | 47b51dad68 | docs(toh-pt6,guide): fix a grammatical error (#2594) | 2016-10-18 15:05:56 +02:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | afd557b887 | 文字微调 | 2016-10-18 20:38:38 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 33249c9de3 | 文字微调 | 2016-10-18 20:34:51 +08:00 |  | 
			
				
					| 
							
							
								 Zhicheng Wang | 1c13200b98 | 文字微调 | 2016-10-18 20:28:42 +08:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | 17ef4622e7 | fix: attribute-directives. | 2016-10-18 12:10:12 +01:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | b7d99121e7 | fix: _data.json | 2016-10-18 11:03:18 +01:00 |  | 
			
				
					| 
							
							
								 Zhimin YE | 9cdc23c0f7 | fix: forms, style guide and template syntax | 2016-10-18 10:47:45 +01:00 |  | 
			
				
					| 
							
							
								 rexebin | ef1eb67ceb | Merge remote-tracking branch 'remotes/angular.io/master' # Conflicts:
#	harp.json
#	public/_includes/_hero-home.jade
#	public/_includes/_scripts-include.jade
#	public/docs/_examples/quickstart/js/package.1.json
#	public/docs/_includes/_side-nav.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/api/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/ngmodule-faq.jade
#	public/docs/ts/latest/cookbook/rc4-to-rc5.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/ngmodule.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/upgrade.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/_data.json
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade | 2016-10-17 22:48:30 +01:00 |  | 
			
				
					| 
							
							
								 rexebin | ce3930b2c0 | Merge remote-tracking branch 'remotes/angular.io/master' # Conflicts:
#	harp.json
#	public/_includes/_hero-home.jade
#	public/_includes/_scripts-include.jade
#	public/docs/_examples/quickstart/js/package.1.json
#	public/docs/_includes/_side-nav.jade
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/api/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/ngmodule-faq.jade
#	public/docs/ts/latest/cookbook/rc4-to-rc5.jade
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/ngmodule.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/upgrade.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/_data.json
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade | 2016-10-17 22:48:18 +01:00 |  | 
			
				
					| 
							
							
								 Ward Bell | 94b8793d70 | docs(template-syntax): correct ref var scope per #2458 (#2602) closes #2458 | 2016-10-13 16:26:41 -07:00 |  | 
			
				
					| 
							
							
								 Kapunahele Wong | f49633a62c | docs(attribute directives): copy edits squashed (#2508) | 2016-10-13 15:42:23 -07:00 |  | 
			
				
					| 
							
							
								 Ward Bell | 0f9a00f144 | docs(changelog): fix title in v.2.1.0 announcement (#2591) | 2016-10-12 15:32:12 -07:00 |  | 
			
				
					| 
							
							
								 Ward Bell | 7b509de819 | docs(changelog): in-sync with Ng v.2.1.0 (#2590) | 2016-10-12 15:29:28 -07:00 |  |