112 Commits

Author	SHA1	Message	Date
rexebin	26100f95f6	搭建 -> 搭建本地开发环境	2016-11-27 10:38:15 +00:00
rexebin	edda524d0d	Merge remote-tracking branch 'angular.io/master' ... # Conflicts: # .travis.yml # public/_includes/_footer.jade # public/_includes/_hero-home.jade # public/_includes/_next-item.jade # public/_includes/_util-fns.jade # public/_includes/_version-dropdown.jade # public/docs/_examples/package.json # public/docs/_examples/quickstart/dart/lib/app_component.dart # public/docs/_examples/quickstart/e2e-spec.ts # public/docs/_examples/quickstart/js/app/app.component.js # public/docs/_examples/quickstart/ts/app/app.component.ts # public/docs/_examples/quickstart/ts/index.html # public/docs/_examples/toh-5/dart/lib/dashboard_component.html # public/docs/_examples/toh-5/dart/lib/hero_detail_component.dart # public/docs/dart/latest/_util-fns.jade # public/docs/dart/latest/guide/_data.json # public/docs/dart/latest/guide/index.jade # public/docs/dart/latest/quickstart.jade # public/docs/index.jade # public/docs/js/latest/quickstart.jade # public/docs/ts/_cache/glossary.jade # public/docs/ts/_cache/guide/dependency-injection.jade # public/docs/ts/_cache/guide/index.jade # public/docs/ts/_cache/quickstart.jade # public/docs/ts/_cache/tutorial/toh-pt5.jade # public/docs/ts/latest/_data.json # public/docs/ts/latest/_quickstart_repo.jade # public/docs/ts/latest/cli-quickstart.jade # public/docs/ts/latest/cookbook/_data.json # public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade # public/docs/ts/latest/cookbook/aot-compiler.jade # public/docs/ts/latest/cookbook/dynamic-form.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/browser-support.jade # public/docs/ts/latest/guide/change-log.jade # public/docs/ts/latest/guide/dependency-injection.jade # public/docs/ts/latest/guide/displaying-data.jade # public/docs/ts/latest/guide/forms.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/router.jade # public/docs/ts/latest/guide/server-communication.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/user-input.jade # public/docs/ts/latest/quickstart.jade # public/docs/ts/latest/tutorial/_data.json # public/docs/ts/latest/tutorial/index.jade # public/docs/ts/latest/tutorial/toh-pt1.jade # public/docs/ts/latest/tutorial/toh-pt3.jade # public/docs/ts/latest/tutorial/toh-pt5.jade # public/docs/ts/latest/tutorial/toh-pt6.jade # public/events.jade # public/resources/images/devguide/quickstart/hello-angular.png # scripts/cache.sh # tools/plunker-builder/indexHtmlTranslator.js	2016-11-26 21:43:16 +00:00
Yang Lin	121e13b5a1	merge 2.2.0	2016-11-23 00:22:04 +08:00
Rex YE	b3555bf990	fix browser-support, style-guide and toh-pt5	2016-11-22 14:54:35 +00:00
Yang Lin	5a7745fb27	Upgrade to 2.2.0	2016-11-22 20:07:16 +08:00
Yang Lin	f67aee12a9	Polish by review	2016-11-21 00:39:46 +08:00
Yang Lin	54e9048e46	Revert "Polish by review" ... This reverts commit bf4e0c49ffb37cc989a4dcca08bd8a6e27fb8f13.	2016-11-21 00:30:05 +08:00
Yang Lin	bf4e0c49ff	Polish by review	2016-11-21 00:22:25 +08:00
Yang Lin	ba8503d9b1	typo	2016-11-06 15:17:58 +08:00
Yang Lin	a934b5993a	Polish toh pt5	2016-11-06 15:08:57 +08:00
rexebin	48dd29e0d5	patch: toh-pt5	2016-11-05 14:48:20 +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	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	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
katerberg	db1df77571	Fixes typo in Router tutorial (#2688)	2016-10-31 00:49:14 -07:00
Samuel Marks	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
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
Zhimin YE	fb4aa6a7a0	fix: #97	2016-10-19 11:06:26 +01:00
Zhimin YE	7fc3e00002	fix: #97	2016-10-19 11:05:10 +01:00
Maurice de Beijer	e89ba6f075	docs(toh-5): fix typo in link (#2622) ... .htm => .html	2016-10-18 15:14:09 +02:00
Zhimin YE	f6d2b39844	fix: toh-pt5	2016-10-18 11:58:43 +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
Rex	606c656f1b	fix: #95	2016-10-17 15:22:23 +01:00
Jesús Rodríguez	e503efe8c8	docs(toh5): add moduleId information (#2597)	2016-10-13 16:41:57 -07:00
Sebastián Ramírez	4f81a7ee8c	docs(toh5): update styles.css link (#2601)	2016-10-14 01:12:06 +02:00
Ward Bell	2e17d587de	docs(toh-5): add AppRoutingModule (#2584)	2016-10-11 16:30:30 -07:00
Brandon	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
Zhimin YE (Rex)	b6ff278ac5	fix: #86	2016-10-03 10:26:22 +01:00
Zhimin YE (Rex)	1523fedcf0	Merge remote-tracking branch 'origin/master'	2016-09-26 15:15:09 +01:00
Zhimin YE (Rex)	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
zhibinr	47b3b3dbba	修复格式错误	2016-09-26 11:13:10 +08:00
Brandon	556e40695a	docs(toh): Replaced window.history with location service (#2439)	2016-09-25 18:56:12 -07:00
Ward Bell	6def9505cc	chore: convert templateUrls to use moduleId where possible. (#2477)	2016-09-25 18:51:54 -07:00
rexebin	f7c60a07df	fix： change all 他 > 它	2016-09-25 19:50:45 +01:00
rexebin	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
Jesús Rodríguez	693f6ae462	chore: rename Angular 2 to simply Angular (#2402)	2016-09-19 20:24:40 -07:00
Zhimin YE (Rex)	6aeb8efaa3	fix: live example localisation.	2016-09-19 10:03:53 +01:00
John Papa	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
Zhicheng Wang	e693d35fb1	合并了最新更新，翻译了官方的发布声明	2016-09-15 17:08:17 +08:00
Zhicheng Wang	2a1c3626c5	去掉了大部分儿化音 ... 感谢来自github的iloveyo123u1和Elderry	2016-09-12 08:35:02 +08:00
Zhicheng Wang	8a7165acf5	对上次的合并查漏补缺	2016-09-10 20:44:57 +08:00
Zhicheng Wang	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
Ward Bell	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
Zhimin YE (Rex)	373ba06e05	fix: toh-pt5	2016-08-24 14:25:47 +01:00
Zhimin YE (Rex)	e1d5af61d2	fix: toh-p5 and p6.	2016-08-23 15:52:39 +01:00
Zhimin YE (Rex)	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
Brandon Roberts	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
Brandon Roberts	a35fcb4dfd	chore(router): Added ModuleWithProviders to routing exports ... closes #2113	2016-08-18 23:57:54 -07:00
Patrice Chalin	0c0c6f69f3	docs(toh-5): TS/Dart review, and Dart resync (#2115) ... * docs(toh-5): review and update/resync Dart **NOTE: run `gulp add-example-boilerplate` after pulling in the commit.** This is preparatory work for #2035. As part of the the chapter review, the Dart .jade was enhanced to use Jade extends (#2018). By the same token it contributed to a post-RC5 resync (#2077). Other key changes: Dart and TS code: - Eliminated `styles.1.css` in favor of docregions in `styles.css`. - `docregion` tags renamed in a few places. - **No other code changes**. TS prose - Fixed: misnamed variable `routing` -> `appRoutes`. - All other changes are **minor copy edits**, or changes to support Dart via Jade extends. Diff of generated HTML for TS chapter was inspected to ensure only minor copy edits prevailed (i.e., that the support for Jade extends had no impact on the generated HTML). * docs(toh-5): edits after doing tutorial - Some adjustments following actually doing the tutorial. In some cases code shown (e.g. this is what file foo should look like now) didn't match what the user would have. E.g., lingering @Input on the hero property. - Fixed some lingering deprecated-router prose elements on TS side (e.g., still referring to a route by the old string names like `HeroDetail`). - Added extra step to `app.component.ts` creation rather than having a critical-call-out later on. - Reorder some prose for better harmony between TS and Dart prose (also improves the flow). - Moved the `styleUrls` call-out to the point of first use. * post-review changes * more post-review changes * toh-6 cache update	2016-08-17 13:31:40 -07:00
Zhimin YE (Rex)	f26ec0a889	(review:) Quick starter and TOH, patch up new paragraphs and mis-alignments.	2016-08-16 10:16:31 +01:00