Commit Graph

2205 Commits

Author SHA1 Message Date
Rex YE a13b40442e fix compile errors. 2016-11-22 14:26:51 +00:00
Rex YE 56228ce571 fix quickstart.jade compile error. 2016-11-22 14:18:53 +00:00
Yang Lin 5a7745fb27 Upgrade to 2.2.0 2016-11-22 20:07:16 +08:00
Rex 672c8114c0 Merge pull request #117 from todoubaba/guide-index
Polish guide index
2016-11-13 19:15:32 +00:00
Rex 763b1c7566 Merge pull request #115 from todoubaba/toh-pt6
Polish toh pt6
2016-11-13 19:14:45 +00:00
rexebin c748e151c8 fix: #119 2016-11-13 19:06:09 +00:00
Yang Lin 9531ac9171 Polish guide index 2016-11-08 22:45:09 +08:00
Yang Lin 6c9b27996c Polish toh pt6 2016-11-06 19:18:18 +08:00
Yang Lin af0359d199 控制台 -> 仪表盘 2016-11-06 16:33:53 +08:00
Yang Lin cf42e8ce7b Promise -> 承诺 2016-11-06 16:33:53 +08:00
Yang Lin b9e72506af Polish toh pt4 2016-11-06 16:33:53 +08:00
Yang Lin 48fca7a8db polish 2016-11-06 11:43:36 +08:00
Yang Lin a13f19f7d4 Polish top pt1 2016-11-06 11:43:36 +08:00
Yang Lin 1cd0742230 more polish 2016-11-06 11:41:49 +08:00
Yang Lin 1586163b0d Polish top pt2 2016-11-06 11:41:49 +08:00
Yang Lin 14eed65c12 Polish toh pt3 2016-11-06 09:41:03 +08:00
Yang Lin b2e92e4a62 polish 2016-11-06 09:30:21 +08:00
Yang Lin 9c799a4f41 Tutorial index 2016-11-06 09:30:21 +08:00
rexebin 48dd29e0d5 patch: toh-pt5 2016-11-05 14:48:20 +00: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
rexebin 7d5e2cf412 Merge remote-tracking branch 'angular.io/master' into merge-review-rex
# Conflicts:
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-11-05 14:08:21 +00:00
Ward Bell 74ef87feac docs: systemjs.config.plunker -> systemjs.config.web w/ auto-bootstrap (#2756)
see PR #2756
2016-11-04 21:59:51 -07:00
Benjamin Dopplinger 83faca0f94 docs(dart): remove unnecessary directives import (#2282) 2016-11-04 09:46:36 -07: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 eb6eae8390 patch visual-studio 2016-11-04 14:05:32 +00:00
Zhimin YE 89d33384ff sync visual-studio cookbook 2016-11-04 13:27:00 +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
Ward Bell fa99a8b0b2 docs(toh-5): dashboard uses [routerLink] bindings #998 (#2718)
* docs(toh-5): dashboard uses [routerLink] bindings #998
closes #998

* chore: temp add toh-5 to bad-code-excerpt-skip-patterns.txt
2016-11-03 10:25:01 -07: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
Ward Bell ae35f0e017 docs(lifecycle-hooks): `SimpleChange` -> `SimpleChanges` #2741 (#2742) 2016-11-02 21:50:38 -07:00
cam73 35d8695752 Removes duplication of head tag in example (#2648) 2016-11-02 15:46:29 -07:00
Filipe Silva f837330eaf chore: remove inner editorconfig (#2736) 2016-11-02 14:49:51 +01:00
Alex Wolfe c6cec50a0a updates to improve search results in Swiftype 2016-11-01 13:40:25 -07: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
katerberg db1df77571 Fixes typo in Router tutorial (#2688) 2016-10-31 00:49:14 -07:00
WilliamKoza 43c9071a2e docs(cookbook): fix spelling error for word 'class' (#2682) 2016-10-31 00:48:22 -07:00
Ward Bell e9d78133e1 docs(testing): revert to jasmine v.2.4.1 (#2697)
Bug in Jasmine v.2.5.x.  Stick with v.2.4.1 (as karma-jasmine does) until the following issue is resolved:
https://github.com/jasmine/jasmine/issues/1231

Unfortunately, there is no `@types/jasmine` for v.2.4 but only for v.2.5.
2016-10-29 23:53:21 -07:00