Commit Graph
96 Commits
Author SHA1 Message Date
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
Ward Bell e9d78133e1 docs(testing): revert to jasmine v.2.4.1 (#2697)
Bug in Jasmine v.2.5.x.  Stick with v.2.4.1 (as karma-jasmine does) until the following issue is resolved:
https://github.com/jasmine/jasmine/issues/1231

Unfortunately, there is no `@types/jasmine` for v.2.4 but only for v.2.5.
2016-10-29 23:53:21 -07:00
Jesús Rodríguez 323becee32 chore: remove bootstrap package (#2691) 2016-10-29 10:44:57 -07:00
Filipe Silva 44bbc7776a fix(e2e): fix travis e2e (#2684)
See angular/webdriver-manager#121
2016-10-27 15:25:09 +01:00
Filipe Silva 4c85f0a91d chore: update to 2.1.1 (#2650) 2016-10-21 22:31:09 +01:00
Ward Bell 14c01fb651 docs(change-log): notes in-mem-web-api breaking change (#2644) 2016-10-20 19:28:19 -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
Jesús Rodríguez a63c75cc18 chore: release 2.1.0 (#2589) 2016-10-12 23:41:42 +02:00
Torgeir Helgevold cdfe957ab8 docs(toh-6-aot): add aot to toh-6 (#2496)
* docs(toh-6-aot): add aot to toh-6

s

s

s

s

s

* docs(toh-6-aot): add aot to toh-6

* docs(toh-6-aot): make aot e2e tests run in the same project
Updates tooling for this purpose and also the prose.
2016-10-12 01:44:49 -07:00
Ward Bell 61b13c13ec chore: v.2.0.2 + standard MIT licenses property (#2559) 2016-10-06 17:21:05 -07:00
Ward Bell 8710eb052d chore(package.json): rename "angular2-" as "angular-" in name (#2558)
also ignore a2docs.css
2016-10-06 16:10:30 -07:00
Filipe Silva 5042b3021c chore(test): add protractor4 (#2233)
* chore(test): add protractor4

* fix lint, remove boilerplate files, fix less gen

* separate scripts between package.json

* ignore a2docs.css in boilerplate

* remove tslint in _examples
2016-10-06 15:25:52 -07:00
Ward Bell 66c567bee5 chore(i18n): correct name of i18n extract command (#2511) 2016-09-29 15:15:33 -07:00
Ward Bell e6199a8dfb docs(i18n): add internationalization (i18n) guide (#2491)
* docs(i18n): add internationalization (i18n) guide

* docs(cb-i18n): revamped to System.import the translation file
2016-09-29 11:15:55 -07:00
Ward Bell 9671d99585 chore: update package.json files to latest pkg versions. Use ~ for Ng. (#2490)
closes #2488
2016-09-27 12:20:17 -07:00
Ward Bell 4a6f35f58b chore(package.json): update many package versions (#2476) 2016-09-25 17:46:06 -07: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 b9826c8ddf chore: update compiler-cli version (#2354) 2016-09-15 04:24:56 +01:00
Filipe Silva 24c61dd7bc chore: here we are (#2353) 2016-09-15 02:41:19 +01:00
Filipe Silva 69ae63c4b1 chore: update examples to TS2.0 (#2329) 2016-09-14 10:15:51 -07:00
Torgeir Helgevold 6813ced018 docs(cookbook - aot compiler) (#2161)
docs(cb-aot-compiler): new cookbook on AoT compiler
2016-09-14 10:10:04 -07:00
Ward Bell 07cfce795f docs(testing): testing chapter and samples for RC6 (#2198)
[WIP] docs(testing): new chapter, new samples
2016-09-13 14:39:39 -07:00
Jesús Rodríguez 988694bb12 chore: update docs to rc7 2016-09-13 08:48:45 -07:00
Ward Bell 9d5bbfca15 chore: update systemjs.configs and plunker-builder/indexHtmlTranslator for RC6 2016-09-01 00:20:58 -07:00
Filipe Silva 0c962712b3 chore: update to rc6 (#2177) 2016-08-31 18:08:57 -07:00
Ward Bell fc2815ff6d docs(ngmodule): updates for clarity; breaks out CoreModule 2016-08-24 23:10:10 -07: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
Peter Bacon Darwin d79adb2422 docs(rc5): update docs and plunkers for rc5 2016-08-09 11:48:07 -07:00
Ward Bell 72efdc5e5b chore: add tslint to example package.json
closes #1926
Not sure how it disappeared.
2016-07-19 11:28:23 -07:00