Skip to content

Commit

Permalink
Merge pull request #2970 from ahumphreys87/build-rc2
Browse files Browse the repository at this point in the history
Build rc2
  • Loading branch information
ahumphreys87 committed Apr 4, 2016
2 parents 5fe4e0e + 43de9fe commit 54dbf72
Show file tree
Hide file tree
Showing 11 changed files with 880 additions and 787 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "The Backbone Framework",
"homepage": "http://marionettejs.org",
"main": "./lib/core/backbone.marionette.js",
"version": "3.0.0-rc1",
"version": "3.0.0-pre.3",
"keywords": [
"backbone",
"framework",
Expand Down
34 changes: 33 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,36 @@
### v3.0.0-rc1
### v3.0.0-pre3

#### Dependency Updates

* Backbone and Underscore moved to peerDependencies to solve dependency conflicts for browserify and webpack users.
* Added support for Lodash 4.

#### Documentation

* Application documentation updates.

#### API Changes

* Removed unused `collection` parameter from `CollectionView.isEmpty`.

#### Bug fixes

* `replaceElement` and `allowMissingEl` are now able to be overridden in `Region.show`.

#### Misc

* Gulp test-browser task fixed.
* es-lint fixes.
* Added more es6 syntax.
* Fixed the UMD exported build.

Also, [please help us finish v3](https://github.com/marionettejs/backbone.marionette/milestones/v3.0.0)!

### v3.0.0-pre2

Extra release to remove public release of v3.0.0-pre.1, this release is available via the `prerelease` tag on npm.

### v3.0.0-pre.1

This is a "family and friends" release. The documentation is still mostly for 2.4.4.
Please let us know if you run into any issues. Also, [please help us finish v3](https://github.com/marionettejs/backbone.marionette/milestones/v3.0.0)!
Expand Down
Loading

0 comments on commit 54dbf72

Please sign in to comment.