Merge pull request #12 from js-data/2.0

2.0
js-data · Jul 2, 2015 · 8edfe7a · 8edfe7a
2 parents 6eef6f5 + b5b557f
commit 8edfe7a
Show file tree

Hide file tree

Showing 12 changed files with 443 additions and 378 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+##### 2.0.0 - 02 July 2015
+
+Stable Version 2.0.0
+
+##### 2.0.0-rc.1 - 27 June 2015
+
+Stable Version 2.0.0-rc.1
+
+##### 2.0.0-beta.1 - 18 April 2015
+
+###### Backwards compatible bug fixes
+- #11 - Race condition, tasks need to be atomic
+
+###### Other
+- Updated dependencies
+
 ##### 1.1.2 - 27 May 2015
 
 ###### Backwards compatible bug fixes

diff --git a/README.md b/README.md
@@ -47,6 +47,8 @@ store.registerAdapter('firebase', adapter, { default: true });
 [CHANGELOG.md](https://github.com/js-data/js-data-firebase/blob/master/CHANGELOG.md)
 
 ### Community
+- [Gitter Channel](https://gitter.im/js-data/js-data) - Better than IRC!
+- [Announcements](http://www.js-data.io/blog)
 - [Mailing List](https://groups.io/org/groupsio/jsdata) - Ask your questions!
 - [Issues](https://github.com/js-data/js-data-firebase/issues) - Found a bug? Feature request? Submit an issue!
 - [GitHub](https://github.com/js-data/js-data-firebase) - View the source code for js-data.

diff --git a/bower.json b/bower.json
@@ -29,7 +29,7 @@
     "karma.start.js"
   ],
   "dependencies": {
-    "js-data": ">=1.5.7",
+    "js-data": ">=2.0.0",
     "firebase": ">=1.1.x"
   }
 }