Skip to content

Commit

Permalink
Merge branch 'master' into wong-ts-to-js
Browse files Browse the repository at this point in the history
  • Loading branch information
wardbell committed Apr 28, 2017
2 parents a145e73 + 3f46645 commit 1749f04
Show file tree
Hide file tree
Showing 957 changed files with 4,523 additions and 3,262 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
<a name="4.1.0"></a>
# [4.1.0](https://github.com/angular/angular/compare/4.1.0-rc.0...4.1.0) (2017-04-26)


### Bug Fixes

* **router:** forward the query parameters in the ng1 -> ng2 url sync ([#16249](https://github.com/angular/angular/issues/16249)) ([2f97731](https://github.com/angular/angular/commit/2f97731)), closes [#16067](https://github.com/angular/angular/issues/16067)
* **upgrade:** use correct attribute name for upgraded component's bindings ([#16128](https://github.com/angular/angular/issues/16128)) ([d1fb066](https://github.com/angular/angular/commit/d1fb066)), closes [#8856](https://github.com/angular/angular/issues/8856)


<a name="4.1.0-rc.0"></a>
# [4.1.0-rc.0](https://github.com/angular/angular/compare/4.1.0-beta.0...4.1.0-rc.0) (2017-04-21)

Expand Down
1 change: 1 addition & 0 deletions aio/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Here are the most important tasks you might need to use:
* `yarn boilerplate:add` - generate all the boilerplate code for the examples, so that they can be run locally.
* `yarn boilerplate:remove` - remove all the boilerplate code that was added via `yarn boilerplate:add`.
* `yarn generate-plunkers` - generate the plunker files that are used by the `live-example` tags in the docs.
* `yarn generate-zips` - generate the zip files from the examples. Zip available via the `live-example` tags in the docs.


## Guide to authoring
Expand Down
8 changes: 4 additions & 4 deletions aio/content/examples/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ dist/
!testing/karma*.js

# TS to JS
!cb-ts-to-js/js*/**/*.js
cb-ts-to-js/js*/**/system*.js
!ts-to-js/js*/**/*.js
ts-to-js/js*/**/system*.js

# webpack
!webpack/**/config/*.js
!webpack/**/*webpack*.js

# style-guide
!style-guide/src/systemjs.custom.js
# styleguide
!styleguide/src/systemjs.custom.js

# plunkers
*plnkr.no-link.html
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
'use strict'; // necessary for es6 output in node
'use strict'; // necessary for es6 output in node

import { browser, element, by, ElementFinder } from 'protractor';

// gulp run-e2e-tests --filter=cb-set-document-title
describe('Set Document Title', function () {

beforeAll(function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ export class AppComponent implements OnInit {
}

ngOnInit() {
this.toastService.activate('Hello style-guide!');
this.toastService.activate('Hello Style Guide!');
}
}

0 comments on commit 1749f04

Please sign in to comment.