241 Commits

Author SHA1 Message Date
Zhicheng Wang
0303a18020 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/structural-directives.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/testing/testing-an-angular-pipe.jade
#	public/docs/ts/latest/tutorial/index.jade
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt3.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-07-07 08:15:51 +08:00
Patrice Chalin
b0e0d94b5c docs: revert Jade to markdown
closes #1818
Previously, the markdown of some chapters was converted to Jade markup
to support the conditional exclusion of TS prose parts in Dart
chapters. This commit reverts some of that back to clean markdown,
thanks to a few custom directives.
2016-07-05 23:03:30 -07:00
Zhicheng Wang
3c5a045633 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/guide/router.jade
2016-07-02 19:16:00 +08:00
Patrice Chalin
0ba3d5d8d6 docs(dart/{quickstart,toh-[56]}): fix project names (#1773)
- Renamed `angular2_getting_started` to `angular2_quickstart` (to match
TS).
- s/-/_/g in project names elsewhere (only toh-5 & -6 needed to be
updated).

Fixes #378.
2016-07-01 11:05:45 -07:00
Zhicheng Wang
21fe9dc1d2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.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/testing/first-app-tests.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/news.jade
2016-07-01 08:24:23 +08:00
Naomi Black
8548d3cb06 chore(nav): update left nav to add glossary back 2016-06-28 13:58:30 -07:00
Patrice Chalin
f06398cd89 docs(toh-6/dart): first edition of prose and example code (#1687)
* docs(toh-6/dart): first edition of prose and example code

NOTE: this PR depends on #1686.

Dart prose and example match TS except that:
- No child-to-parent event emission occurs.
- Support for Add Hero is added as an unconditional feature of the
Heroes view.
- http `_post` takes only a name
- http `delete` takes only a hero id.
- The Dart in-memory-data-service has been dropped in favor of an
implementation based on the "standard" `http.testing.MockClient` class.

* post-review changes
2016-06-28 13:12:49 -07:00
Zhicheng Wang
bb9adc3eba Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/style-guide.jade
2016-06-23 08:48:57 +08:00
Naomi Black
7d5614ef82 chore(version): bump the docs version to rc3 2016-06-22 15:07:34 -07:00
Martin Probst
fb179d9690 docs(security): Add security documentation.
Substantially rewritten, based on original content by Brian Clarkio and
Ward Bell and contributions from Naomi Black.
2016-06-21 10:51:25 -07:00
Zhicheng Wang
0aa207bbac Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/guide/_data.json
2016-06-19 10:17:03 +08:00
Kathy Walrath
511ee3d8ed [WIP] Add link to AngularDart API docs 2016-06-16 13:37:44 -07:00
Zhimin YE (Rex)
e8a462435c Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cheatsheet.jade
#	public/news.jade
2016-06-16 09:03:59 +01:00
Naomi Black
a35e0fd4ef chore(docs): bump version to RC on boilerplate 2016-06-15 16:14:50 -07:00
Patrice Chalin
25dc59daac docs(toh-3/dart): copyedits (#1637) 2016-06-15 14:58:05 -07:00
Zhimin(Rex) YE
b5f0eadfa0 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/glossary.jade
2016-06-15 21:58:10 +01:00
Patrice Chalin
cd970c21ad docs(toh-3/dart): copyedits and new snake_case glossary entry (#1629) 2016-06-15 10:49:42 -07:00
Zhicheng Wang
6a5f4a0fc2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-06-15 23:10:41 +08:00
Patrice Chalin
6e5d8e6491 docs(toh-5/dart): review edits and code cleanup (#1643) 2016-06-15 07:46:26 -07:00
Zhimin YE (Rex)
466f69d30a Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/cookbook/_data.json
#	tools/api-builder/angular.io-package/templates/class.template.html
2016-06-15 12:01:54 +01:00
Deborah Kurata
e7f3fc61ce docs(cb-vs2015) new cookbook for Visual Studio 2015 QuickStart
closes #1502
2016-06-13 23:55:14 -07:00
Zhicheng Wang
6b8e09bf2b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/guide/dependency-injection.jade
2016-06-10 13:34:18 +08:00
Patrice Chalin
1cc5284cc2 docs(toh-2/dart): copyedits (#1621) 2016-06-08 16:24:56 -07:00
Patrice Chalin
3c77a7fcd1 docs(basics/di): minor edits following TS switch to provider object literal (#1600)
Minor edits:
- Dart side adjustments following #1594.
- Renamed example '3a' to just '3' and tweaked the logger message
- Removed obsolete Dart block.
2016-06-08 09:25:48 -07:00
Zhicheng Wang
f2dbdb3163 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/_examples/cb-component-communication/e2e-spec.ts
#	public/docs/_examples/cb-component-communication/ts/app/app.component.ts
#	public/docs/_examples/dependency-injection/ts/app/main.1.ts
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-06-08 10:02:24 +08:00
Patrice Chalin
7e52648ee7 docs(toh): update live example links (#1602) 2016-06-07 15:51:25 -07:00
Patrice Chalin
afee8dbe7e docs(toh-1/dart): minor edits (#1614)
- Fixed HTML.
- Removed unnecessary snippet since it is in the code.
- Copyedit (Hero Property) -> (Hero property).
2016-06-07 14:59:41 -07:00
Zhimin(Rex) YE
633964ac2f Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/upgrade.jade
2016-06-04 17:52:51 +01:00
Zhimin(Rex) YE
5ae026ced3 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/_examples/dependency-injection/ts/app/main.1.ts
#	public/docs/ts/latest/guide/dependency-injection.jade
2016-06-04 16:45:10 +01:00
Foxandxss
c185c3548c chore: use the provide object literal
closes #1594
replace `provide(...{use:...})` with `{provide: ..., use...}` syntax
2016-06-04 01:33:36 -07:00
Patrice Chalin
05864c2584 docs(dependency-injection): revised Dart and TS code and prose (#1573)
docs(dependency-injection): revise Dart and TS code and prose
2016-06-03 11:16:46 -07:00
Zhimin(Rex) YE
ce299be58b Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/quickstart.jade
2016-06-02 22:29:17 +01:00
Patrice Chalin
7570dc53ea chore(dart/api): remove generated files (#1587) 2016-06-02 10:44:51 -07:00
Patrice Chalin
b48cde3a43 chore(_util-fns): generalize makeExample, drop makeProjExample (#1510)
+ Rename adjustExample{Path|Title} to adjustTsExample*4Dart
+ `makeExample` can now work with both doc folder relative and project
relative paths.
2016-06-02 17:06:03 +01:00
Zhimin YE (Rex)
72efc8f055 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	README.md
#	public/contribute.jade
#	public/docs/_examples/cb-component-communication/e2e-spec.ts
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-06-01 09:51:27 +01:00
Vikash
8569479423 docs: fix numerous typos in many doc files.
closes #1509
2016-06-01 01:08:56 -07:00
Ward Bell
2f115a3425 chore: fix broken devguide links as of May 31
Did not fix broken Dart and API links
2016-06-01 00:52:22 -07:00
Patrice Chalin
5e50b2ef10 chore(util-fns): minor cleanup and refactoring (#1562)
This only impacts language dependent variable and path definitions:
- Removed deprecated variable.
- Hoisted useful variable definitions from quickstart into _util-fns.
- Minor fix in regexp of path translation function
2016-05-31 15:25:59 -07:00
Zhicheng Wang
752a152731 Merge remote-tracking branch 'origin/master'
upgrade.jade的附录没有翻译

# Conflicts:
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/quickstart.jade
#	public/index.jade
2016-05-30 21:46:16 +08:00
Foxandxss
b962383193 chore: re-title webpack guide to emphasize "Webpack", not "Intro"
closes #1492
2016-05-29 12:27:44 -07:00
Zhimin(Rex) YE
cbea511cad Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/guide/template-syntax.jade
2016-05-26 23:48:22 +01:00
Patrice Chalin
a664f46231 docs(template-syntax): review and update Dart to new doc design (#1465)
* ts template-syntax.jade without docregion tags
* update guide/template-syntax for dart and ts
* clarify style property naming in Dart
2016-05-25 15:09:45 -07:00
Patrice Chalin
ed16d82335 chore(dart/_util-fns): make adjustTsExamplePath4Dart idempotent (#1515)
Fixes #1513.
2016-05-25 11:43:06 -07:00
Zhicheng Wang
4699047cdd 修改一些BUG 2016-05-25 07:38:57 +08:00
Ward Bell
f9fea00824 docs(component-relative-paths): new cookbook 2016-05-20 20:33:38 -07:00
Patrice Chalin
da48db3c77 docs(server-communication): cleanup, mainly for Dart (#1455)
- Dart code: fix issues raised by @thso during review.
- Dart code: remove "show x" clauses from imports.
- Dart add docsync config file.
- Prose: make consistent use of _Http variables; otherwise use "HTTP".
- Prose: add links to the demos list.

* _heroesUrl as static const
2016-05-20 17:14:37 -07:00
Patrice Chalin
6d2d52c588 docs(dart): cleanup 'live example' links (#1449)
This fixes various issues such as:
- missing space in Dart version between the live demo and demo source
links.
- Live example link directing to Plunker for Dart.

The main mixins (`liveExampleLink`*) used to support the generation of
links now assume reasonable default values for their arguments, and in
most cases the defaults are used.

* Dart example links: use http vs https

As agree to with @kwalrath.
2016-05-20 16:18:58 -07:00
Kathy Walrath
2dc60188c2 docs(dart): convert toh-5 to Dart (#1426)
Some issues remain (see #1426 review comments), but this is much better than nothing.
2016-05-19 08:03:23 -07:00
Ward Bell
29511831cd docs(server-communication): heavily refactored (TS & Dart) 2016-05-19 02:48:43 -07:00
Kathy Walrath
a595eb81ef docs(dart): update BASICS intro (#1410)
Also copy edited the TS version a bit.
2016-05-18 13:43:02 -07:00