Merge branch 'master' into bugfix-active-section

jimmynotjim · Oct 9, 2014 · a237659 · a237659
2 parents b9a9979 + 50954cb
commit a237659
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 20 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -10,6 +10,5 @@
   "unused": true,
   "boss": true,
   "eqnull": true,
-  "node": true,
-  "es5": true
+  "node": true
 }
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - 0.8
+  - 0.10
 before_script:
   - npm install -g grunt-cli
   - npm install semver

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,11 @@ And constructed with these guidelines:
 
 For more information on semantic versioning, please visit http://semver.org/.
 
+## v2.3.0 - October 9, 2014
+
+* Updated min Node to 0.10.*
+* Updated all Node plugins to latest
+
 ## v2.2.0 - March 14, 2014
 
 * Added option to change the classname used throughout the plugin.

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![build status](https://secure.travis-ci.org/jimmynotjim/scrollNav.png?branch=v2.2.0)](http://travis-ci.org/jimmynotjim/scrollNav.js)
+[![build status](https://secure.travis-ci.org/jimmynotjim/scrollNav.png?branch=v2.3.0)](http://travis-ci.org/jimmynotjim/scrollNav.js)
 
 # [jQuery scrollNav][1]
 
@@ -213,7 +213,7 @@ scrollNav is Copyright &copy; 2012-2013 James Wilson, released under the [MIT li
 
 ## Version
 
-Latest stable version is v2.2.0. Make sure to view [the changelog][15] before updating, v2 is a complete re-write of the plugin.
+Latest stable version is v2.3.0. Make sure to view [the changelog][15] before updating, v2 is a complete re-write of the plugin.
 
 ## Testing
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "scrollNav",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "author": {
     "name": "James Wilson",
     "email": "[email protected]",

diff --git a/dist/jquery.scrollNav.js b/dist/jquery.scrollNav.js
@@ -1,4 +1,4 @@
-/*! scrollNav - v2.2.0 - 2014-03-14
+/*! scrollNav - v2.3.0 - 2014-10-09
 * http://scrollnav.com
 * Copyright (c) 2014 James Wilson; Licensed MIT */
 (function($) {

diff --git a/dist/jquery.scrollNav.min.js b/dist/jquery.scrollNav.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scrollNav",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "title": "scrollNav",
   "author": {
     "name": "James Wilson",
@@ -32,21 +32,21 @@
     }
   ],
   "engines": {
-    "node": ">= 0.8.0"
+    "node": ">= 0.10.0"
   },
   "scripts": {
     "test": "grunt qunit"
   },
   "devDependencies": {
     "grunt": "~0.4.1",
-    "semver": "~2.2.1",
-    "load-grunt-tasks": "~0.2.0",
+    "semver": "~4.0.3",
+    "load-grunt-tasks": "~0.6.0",
     "grunt-exec": "~0.4.2",
-    "grunt-contrib-clean": "~0.4.0",
-    "grunt-contrib-concat": "~0.1.2",
-    "grunt-contrib-jshint": "~0.1.1",
-    "grunt-contrib-qunit": "~0.1.1",
-    "grunt-contrib-uglify": "~0.1.1",
-    "grunt-contrib-watch": "~0.2.0"
+    "grunt-contrib-clean": "~0.6.0",
+    "grunt-contrib-concat": "~0.5.0",
+    "grunt-contrib-jshint": "~0.10.0",
+    "grunt-contrib-qunit": "~0.5.2",
+    "grunt-contrib-uglify": "~0.6.0",
+    "grunt-contrib-watch": "~0.6.1"
   }
 }
diff --git a/scrollNav.jquery.json b/scrollNav.jquery.json
@@ -1,6 +1,6 @@
 {
   "name": "scrollNav",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "title": "scrollNav",
   "description": "A jQuery plugin for building a scrolling side navigation menu",
   "homepage": "http://scrollnav.com",