diff --git a/CHANGELOG.md b/CHANGELOG.md index f4722d4b..cae4fb03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 0.10.0 ## + +* Updated dependencies and locked Backbone to 1.1.2 +* Removed `then` method, if you want to use promises, call `.promise().then` + ## 0.9.7 ## * Adds in a `cleanup` event whenever a view has been removed diff --git a/LICENSE b/LICENSE index 7ab7439e..09341a2c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2015 Tim Branyen +Copyright (c) 2016 Tim Branyen Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/README.md b/README.md index 8e55824e..c05ed32d 100644 --- a/README.md +++ b/README.md @@ -30,8 +30,8 @@ http://layoutmanager.org/From-0.8-to-0.9 #### Release notes #### -* Updated dependencies and locked Backbone to 1.1.2 -* Removed `then` method, if you want to use promises, call `.promise().then` +* Backbone 1.2.0 support +* Ensures cancelAnimationFrame does not exist before polyfilling [Full Release Log](https://github.com/tbranyen/backbone.layoutmanager/blob/master/CHANGELOG.md) diff --git a/backbone.layoutmanager.js b/backbone.layoutmanager.js index 588c20ff..ed8a8f8b 100644 --- a/backbone.layoutmanager.js +++ b/backbone.layoutmanager.js @@ -1,6 +1,6 @@ /*! - * backbone.layoutmanager.js v0.10.0 - * Copyright 2015, Tim Branyen (@tbranyen) + * backbone.layoutmanager.js v1.0.0 + * Copyright 2016, Tim Branyen (@tbranyen) * backbone.layoutmanager.js may be freely distributed under the MIT license. */ (function(window, factory) { diff --git a/bower.json b/bower.json index 64f94f6b..c09f9060 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "layoutmanager", - "version": "0.10.0", + "version": "1.0.0", "main": "backbone.layoutmanager.js", "dependencies": { "jquery": ">=1.6", diff --git a/package.json b/package.json index d4af232b..a2c876ec 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Tim Branyen (@tbranyen)", "name": "backbone.layoutmanager", "description": "A layout and template manager for Backbone.js applications.", - "version": "0.10.0", + "version": "1.0.0", "homepage": "http://layoutmanager.org/", "repository": { "type": "git",