Merge pull request #11 from js-data/2.0

2.0

Author: jmdobry

CHANGELOG.md

@@ -1,3 +1,15 @@
+##### 2.0.0 - 02 July 2015
+
+Stable Version 2.0.0
+
+##### 2.0.0-rc.1 - 30 June 2015
+
+Added `getEndpoint()`, which was removed from JSData
+
+##### 2.0.0-beta.1 - 17 April 2015
+
+Prepare for 2.0
+
 ##### 1.2.3 - 07 March 2015
 
 ###### Other

Gruntfile.js

@@ -71,12 +71,6 @@ module.exports = function (grunt) {
             commonjs: 'js-data',
             commonjs2: 'js-data',
             root: 'JSData'
-          },
-          'js-data-schema': {
-            amd: 'js-data-schema',
-            commonjs: 'js-data-schema',
-            commonjs2: 'js-data-schema',
-            root: 'Schemator'
           }
         },
         module: {
@@ -111,7 +105,8 @@ module.exports = function (grunt) {
         browsers: ['Chrome', 'Firefox', 'PhantomJS'],
         options: {
           files: [
-            'bower_components/js-data/dist/js-data.min.js',
+            'node_modules/es6-promise/dist/es6-promise.js',
+            'node_modules/js-data/dist/js-data.js',
             'dist/js-data-http.min.js',
             'karma.start.js',
             'test/**/*.js'

bower.json

@@ -29,6 +29,6 @@
     "karma.start.js"
   ],
   "dependencies": {
-    "js-data": ">=1.1.0"
+    "js-data": ">=2.0.0"
   }
 }