Stable Version 2.3.0.

Merged #328
js-data · Apr 15, 2015 · 7131efe · 7131efe
1 parent 8a678e6
commit 7131efe
Show file tree

Hide file tree

Showing 10 changed files with 305 additions and 267 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+##### 2.3.0 - 15 April 2015
+
+###### Backwards compatible API changes
+- #328 - Add support for `js-data-sql` adapter
+
+###### Backwards compatible bug fixes
+- #328 - Fixed adapter registration
+
 ##### 2.2.3 - 08 March 2015
 
 ###### Other

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -104,11 +104,11 @@ module.exports = function (grunt) {
         },
         module: {
           loaders: [
-            { test: /(src)(.+)\.js$/, exclude: /node_modules/, loader: 'babel-loader?blacklist=useStrict' }
+            { test: /(.+)\.js$/, exclude: /node_modules/, loader: 'babel-loader?blacklist=useStrict' }
           ],
           preLoaders: [
             {
-              test: /(src)(.+)\.js$|(test)(.+)\.js$/, // include .js files
+              test: /(.+)\.js$/, // include .js files
               exclude: /node_modules/, // exclude any and all files in the node_modules folder
               loader: "jshint-loader?failOnHint=true"
             }

diff --git a/bower.json b/bower.json
@@ -28,7 +28,10 @@
     "angular-mocks-1.3.2": "angular-mocks#1.3.2"
   },
   "dependencies": {
-    "js-data": ">=1.1.0",
-    "angular": ">=1.0.3"
+    "js-data": ">=1.5.7",
+    "angular": ">=1.1.0"
+  },
+  "resolutions": {
+    "angular": "1.3.2"
   }
 }
diff --git a/circle.yml b/circle.yml
@@ -1,3 +1,7 @@
+general:
+  branches:
+    ignore:
+      - gh-pages # list of branches to ignore
 dependencies:
   pre:
     - bower install