1070 Commits

Author SHA1 Message Date
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
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