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
5a7745fb27
Upgrade to 2.2.0
2016-11-22 20:07:16 +08:00
Patrice Chalin
014883d074
docs(*): fix links to Dart API entries ( #2185 )
...
* docs(*): fix links to Dart API entries
* post-review updates
2016-08-24 14:46:06 -07:00
Patrice Chalin
68c15c12e5
docs({quickstart,di}): fix code excerpts and titles ( #2118 )
2016-08-17 09:21:11 -07:00
Patrice Chalin
5ce8304227
docs(dart): decouple from TS .jade files temporarily ( #2044 )
...
Addresses #2043 .
2016-08-08 15:48:45 -07:00
Patrice Chalin
fb9edf972e
chore: fix "Invalid example" warnings from shred map builder
...
closes #1832
The shred map (xref) builder was issuing warnings. This fix includes
- Adjustments to the shredder map builder itself so that it
understands, e.g., app-project relative example paths.
- `**/guide/glossary.jade` now (Jade) `includes` the shared parent
`glossary.jade` rather than (Harp) importing (via `partial`). This
fixes `makeExample` path issues in the glossary.
- Adjusted some `makeExample` paths that were ok for site build, but
confused the xref tool.
2016-07-11 20:10:56 -07: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
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
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
Kathy Walrath
10877bdbfc
docs(dependency-injection): add Dart version, tweak TS version
...
closes #972
2016-03-25 15:21:11 -07:00
Josh Otis
746a6649b2
chore: new flat left navigation panel (all language tracks)
2016-03-03 04:51:52 -08:00
luis
1ac9316171
docs(dependency-injection): add Dart sample
...
closes #817
2016-02-16 13:58:29 -08:00
Kathy Walrath
49f4b9e147
docs(guide): add placeholders for missing Dart chapters
...
closes #736
2016-01-25 15:47:09 -08:00
