Rebase

.gitignore

@@ -5,4 +5,6 @@ bower_components/
 *.iml
 
 coverage/
-junit/
+junit/
+doc/
+node_modules/

CONTRIBUTORS

@@ -5,7 +5,7 @@
 # Names should be added to this file as:
 #   [commit count] Name <email address>
      1	InternalFX <[email protected]>
-    53	Jason Dobry <[email protected]>
+    66	Jason Dobry <[email protected]>
      1	Josh Drake <[email protected]>
      1	RobertHerhold <[email protected]>
      3	Tomás Fox <[email protected]>

README.md

@@ -9,13 +9,24 @@
 [![Coverage Status][cov_b]][cov_l]
 [![Codacy][cod_b]][cod_l]
 
-HTTP adapter for [js-data](http://www.js-data.io/).
+This repo contains HTTP adapters for [js-data](http://www.js-data.io/):
+
+- js-data-http - HTTP (XHR, includes [axios][axios]) adapter for js-data in the
+browser. Capable of using `window.fetch` instead of axios.
+- js-data-fetch - Same as js-data-http but doesn't include axios and will use
+`window.fetch` if available and if you don't provide your own http library.
+- js-data-http-node - Same as js-data-http but runs on Node.js. Depends on axios
+and will use axios unless you provide a different http library.
+
+Tested on IE9, Chrome 46, Firefox 41 & Safari 7.1 using
+<img src="https://raw.githubusercontent.com/js-data/js-data-localstorage/master/bs.jpg" alt="bs logo" title="browserstack" width="150" height="35" style="vertical-align: middle" />
 
 To get started, visit __[http://js-data.io](http://www.js-data.io)__.
 
 ## Table of contents
 
 * [Quick start](#quick-start)
+* [Dependencies](#dependencies)
 * [Guides and Tutorials](#guides-and-tutorials)
 * [API Reference Docs](#api-reference-docs)
 * [Community](#community)
@@ -48,6 +59,13 @@ container.find('school', 1).then(function (school) {
 })
 ```
 
+## Dependencies
+
+`js-data-http` bundles axios and depends on `js-data`. `js-data-fetch` depends
+on `js-data`. `js-data-http-node` depends on `js-data` and optionally axios.
+
+See [JSData's dependencies](https://github.com/js-data/js-data/blob/master/README.md#dependencies).
+
 ## Guides and Tutorials
 
 [Get started at http://js-data.io](http://js-data.io)

bower.json

@@ -1,16 +1,12 @@
 {
   "name": "js-data-http",
-  "description": "HTTP adapter for js-data.",
-  "homepage": "http://www.js-data.io/docs/dshttpadapter",
+  "description": "HTTP (XHR) adapter for js-data in the browser.",
+  "homepage": "https://github.com/js-data/js-data-http",
   "repository": {
     "type": "git",
     "url": "https://github.com/js-data/js-data-http.git"
   },
-  "author": {
-    "name": "Jason Dobry",
-    "url": "http://www.pseudobry.com",
-    "email": "[email protected]"
-  },
+  "author": "js-data-http project authors",
   "main": "./dist/js-data-http.js",
   "ignore": [
     ".idea/",
@@ -31,6 +27,6 @@
     "karma.start.js"
   ],
   "dependencies": {
-    "js-data": ">=3.0.0-alpha.8"
+    "js-data": ">=3.0.0-alpha.15"
   }
 }