23984f8caf
fix few compiling errors(live examples)
2016-11-03 15:52:05 +00:00
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
db1df77571
Fixes typo in Router tutorial ( #2688 )
2016-10-31 00:49:14 -07:00
c746c732aa
Typo fix ( #2657 )
...
Technically 'nestled' still makes sense in this context, but is a little too Christmas-y! - I assume you meant 'nested' :P
2016-10-23 00:52:12 -07:00
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
fb4aa6a7a0
fix : #97
2016-10-19 11:06:26 +01:00
7fc3e00002
fix : #97
2016-10-19 11:05:10 +01:00
e89ba6f075
docs(toh-5): fix typo in link ( #2622 )
...
.htm => .html
2016-10-18 15:14:09 +02:00
f6d2b39844
fix: toh-pt5
2016-10-18 11:58:43 +01:00
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
606c656f1b
fix : #95
2016-10-17 15:22:23 +01:00
883a29ecf7
Fix minor typo in HTTP guide ( #2604 )
2016-10-14 12:35:28 +02:00
e503efe8c8
docs(toh5): add moduleId information ( #2597 )
2016-10-13 16:41:57 -07:00
4f81a7ee8c
docs(toh5): update styles.css link ( #2601 )
2016-10-14 01:12:06 +02:00
2e17d587de
docs(toh-5): add AppRoutingModule ( #2584 )
2016-10-11 16:30:30 -07:00
2751b20aae
修正 教程 7.Http 翻译问题
2016-10-10 06:53:40 +08:00
ff118810ff
docs(router): Updated routing examples to use routing modules ( #2478 )
...
Simplified routing in tutorial example
Updated ngmodule guide and ngmodule faq with routing module prose
2016-10-05 14:59:09 -07:00
b6ff278ac5
fix : #86
2016-10-03 10:26:22 +01:00
1523fedcf0
Merge remote-tracking branch 'origin/master'
2016-09-26 15:15:09 +01:00
a18aa9ec01
Merge remote-tracking branch 'remotes/angular.io/master'
...
# Conflicts:
# public/docs/ts/latest/guide/_data.json
# public/docs/ts/latest/guide/architecture.jade
# public/docs/ts/latest/guide/displaying-data.jade
# public/docs/ts/latest/guide/index.jade
# public/docs/ts/latest/guide/lifecycle-hooks.jade
# public/docs/ts/latest/guide/testing.jade
# public/docs/ts/latest/tutorial/toh-pt5.jade
2016-09-26 15:14:39 +01:00
47b3b3dbba
修复格式错误
2016-09-26 11:13:10 +08:00
556e40695a
docs(toh): Replaced window.history with location service ( #2439 )
2016-09-25 18:56:12 -07:00
6def9505cc
chore: convert templateUrls to use moduleId where possible. ( #2477 )
2016-09-25 18:51:54 -07:00
f7c60a07df
fix： change all 他 > 它
2016-09-25 19:50:45 +01:00
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
b2c6acf1ad
docs(tutorial): fix broken link ( #2420 )
...
Fixes #2419
2016-09-20 10:56:38 -07:00
693f6ae462
chore: rename Angular 2 to simply Angular ( #2402 )
2016-09-19 20:24:40 -07:00
e016f3f31e
docs(tutorial): don't use shredder for intro page ( #2388 )
...
An initial multilang cleanup for ng2.io
2016-09-19 16:56:17 -07:00
054d25cefe
fix: toh-pt6 and embeded live example in ngmodule.
2016-09-19 14:48:05 +01:00
6aeb8efaa3
fix: live example localisation.
2016-09-19 10:03:53 +01:00
94d48f2b95
fix: toh1 and 2
2016-09-19 10:00:09 +01:00
159b196baf
docs(toh): fix spelling of ActivateRoute to ActivatedRoute ( #2400 )
...
* fixed spelling of ActivateRoute to ActivatedRoute
* dont do cache
2016-09-18 18:34:32 +02:00
6f6f89ed9c
把所有“内建”改为“内置”
2016-09-17 11:46:17 +08:00
e693d35fb1
合并了最新更新，翻译了官方的发布声明
2016-09-15 17:08:17 +08:00
2a1c3626c5
去掉了大部分儿化音
...
感谢来自github的iloveyo123u1和Elderry
2016-09-12 08:35:02 +08:00
1a45c1f8fc
更正中文社区的阿泽指出的错误
2016-09-11 09:35:54 +08:00
8a7165acf5
对上次的合并查漏补缺
2016-09-10 20:44:57 +08:00
969da7d321
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# README.md
# public/_includes/_scripts-include.jade
# public/docs/_examples/homepage-hello-world/ts/index.1.html
# public/docs/_examples/homepage-tabs/ts/index.1.html
# public/docs/_examples/homepage-todo/ts/index.1.html
# public/docs/_examples/systemjs.config.plunker.build.js
# public/docs/_examples/systemjs.config.plunker.js
# public/docs/js/latest/cookbook/ts-to-js.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cookbook/component-communication.jade
# public/docs/ts/latest/cookbook/component-relative-paths.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/_data.json
# 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/index.jade
# public/docs/ts/latest/guide/lifecycle-hooks.jade
# public/docs/ts/latest/guide/ngmodule.jade
# public/docs/ts/latest/guide/npm-packages.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/typescript-configuration.jade
# public/docs/ts/latest/index.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/tutorial/_data.json
# public/docs/ts/latest/tutorial/toh-pt6.jade
# public/features.jade
# public/resources/js/directives/live-example.js
# tools/plunker-builder/indexHtmlTranslator.js
2016-09-08 17:20:01 +08:00
6ff9e1a5c1
docs(toh-6): missing create instruction ( #2264 )
...
fixes #2231
also addresses `<h1>` issue raised in PR #2256
2016-09-03 13:46:27 -07:00
907f848c95
docs(toh-6): refactoring of 'add, edit, delete heroes' ( #2170 )
...
* docs(toh-6/dart): refactoring of 'add, edit, delete heroes'
Refactoring of "add, edit, delete heroes" section of toh-6 from one big
bottom-up step into small independent feature slices, where the user
achieves a "milesone" (i.e., can run the full app) after each feature
section. The section rewrite is shorter and offers a better UX.
Other simplifications:
- Error handling is consistent: in the hero service we log to the
console, everwhere else we just let errors bubble up.
- Hero service methods renamed based on function (create, update)
rather then lower-level implementation (post, put).
- @Output properties have been eliminated (since they weren't
explained).
E2E tests now pass on both the TS and Dart sides.
* docs(toh-6/ts): refactoring of 'add, edit, delete heroes'
Refactoring of "add, edit, delete heroes" section of toh-6 from one big
bottom-up step into small independent feature slices, where the user
achieves a "milesone" (i.e., can run the full app) after each feature
section. The section rewrite is shorter and offers a better UX.
Other simplifications:
- Error handling is consistent: in the hero service we log to the
console, everwhere else we just let errors bubble up.
- Hero service methods renamed based on function (create, update)
rather then lower-level implementation (post, put).
- @Output properties have been eliminated (since they weren't
explained).
E2E tests now pass on both the TS and Dart sides.
Post-Dart-review updates included.
* docs(toh-6): ward tweaks
2016-08-26 14:57:45 -07:00
373ba06e05
fix: toh-pt5
2016-08-24 14:25:47 +01:00
c26d6a87a0
fixed: toh-pt6
2016-08-24 14:11:32 +01:00
4fe7e24f16
fix: web API to Web API
2016-08-24 10:23:22 +01:00
e1d5af61d2
fix: toh-p5 and p6.
2016-08-23 15:52:39 +01:00
654030f09d
Merge remote-tracking branch 'remotes/angular.io/master'
...
# Conflicts:
# public/docs/ts/latest/cookbook/dependency-injection.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
# public/docs/ts/latest/guide/lifecycle-hooks.jade
# public/docs/ts/latest/guide/server-communication.jade
# public/docs/ts/latest/guide/template-syntax.jade
# public/docs/ts/latest/guide/user-input.jade
# public/docs/ts/latest/guide/webpack.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/tutorial/toh-pt2.jade
# public/docs/ts/latest/tutorial/toh-pt4.jade
# public/docs/ts/latest/tutorial/toh-pt5.jade
# public/docs/ts/latest/tutorial/toh-pt6.jade
2016-08-23 14:02:54 +01:00
f82232ae05
fix : #57
2016-08-23 10:21:32 +01:00
5c5c9ca16c
fix(toh-5): Fixed issues in tutorial flow
...
The HeroDetailComponent should be in the module declarations from the beginning.
InMemoryWebApiModule.forRoot(InMemoryDataService) and correct text
2016-08-19 03:43:00 -07:00
a35fcb4dfd
chore(router): Added ModuleWithProviders to routing exports
...
closes #2113
2016-08-18 23:57:54 -07:00
e9a41bac47
docs(toh): add return types
...
closes #1983
2016-08-17 22:41:06 -07:00
a2d6ea3a97
docs(toh): consistency fix
...
closes #2087
2016-08-17 17:47:15 -07:00
Zhimin YE
katerberg
Samuel Marks
Filipe Silva
Maurice de Beijer
rexebin
Sebastián Ramírez
Jesús Rodríguez
Ward Bell
SangKa
Brandon
zhibinr
Patrice Chalin
John Papa
Zhicheng Wang