rexebin
3c1d528a1c
merge
2016-11-26 21:44:27 +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
5a7745fb27
Upgrade to 2.2.0
2016-11-22 20:07:16 +08:00
Patrice Chalin
b1917b800f
chore: remove deprecated liveExample mixins ( #2670 )
...
`+liveExample` mixins were replaced by `<live-example>` directives a
while ago. This cleanup fixes link issues to the plunker under ng2.io.
2016-10-25 20:26:13 +01:00
Ward Bell
6e17d33475
chore: update samples to "angular-in-memory-web-api" ( #2472 )
...
chore: update samples to "angular-in-memory-web-api"
2016-09-25 15:24:13 -07:00
Filipe Silva
0c962712b3
chore: update to rc6 ( #2177 )
2016-08-31 18:08:57 -07:00
Patrice Chalin
a24800aed7
docs(lifecycle-hooks): update to cache file ( #2222 )
...
No other changes.
2016-08-30 14:02:19 -07: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
f0daf5d238
docs(lifecycle-hooks): post-RC5 Dart resync ( #2141 )
...
* lifecycle-hooks: copy latest to cache
* docs(lifecycle-hooks): post-RC5 Dart resync
- TS prose: removed mention of `routerOnActivate` which no longer
exists in the new router.
- TS improvements to the sample code have also been propagated to the
Dart sample.
Contributes to #2077 .
E2E tests pass now.
* post-review updates
2016-08-19 15:07:30 -07:00
Ward Bell
207b04e264
docs(template-syntax): tweak [(ngModel)] section header
2016-08-17 16:42:56 -07:00
Patrice Chalin
6df26b5058
docs(template-syntax): update cache copy from latest + post-RC5 Dart resync
...
closes #2121
Contributes to #2077 .
2016-08-17 16:10:52 -07:00
Patrice Chalin
7075cdbefa
docs(hierarchical-di): post-RC5 Dart resync ( #2080 )
...
Contributes to #2077 .
Depends on #2078 .
2016-08-11 14:43:59 -07:00
Patrice Chalin
5ce8304227
docs(dart): decouple from TS .jade files temporarily ( #2044 )
...
Addresses #2043 .
2016-08-08 15:48:45 -07:00
