Merge remote-tracking branch 'upstream/master' into storeMixins

BinaryMuse · Sep 10, 2015 · fdaf295 · fdaf295
2 parents 0f14b25 + 0537787
commit fdaf295
Show file tree

Hide file tree

Showing 47 changed files with 2,235 additions and 1,356 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,10 @@
+sudo: false
 language: node_js
 node_js:
   - 0.10
+  - 0.12
+  - iojs-v1.8.4
+  - iojs-v2.5.0
 notifications:
   webhooks:
     urls:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,28 @@
+Version 1.7.1
+=============
+
+* Relax restrictions on Lodash version (#128)
+
+Version 1.7.0
+=============
+
+* Add `Flux#getAllStores()` to retrieve all currently registered stores (#127)
+
+Version 1.6.0
+=============
+
+* Add `Flux#setDispatchInterceptor` to wrap or replace dispatch functionality (#100, #92)
+
+Version 1.5.4
+=============
+
+* Fix incompatibility with Lodash 3.9.0
+
+Version 1.5.3
+=============
+
+* Use built-in inherits instead of npm package (#116)
+
 Version 1.5.2
 =============
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "fluxxor",
-  "version": "1.5.2",
+  "version": "1.7.1",
   "main": "build/fluxxor.min.js",
   "description": "Flux architecture tools for React",
   "homepage": "",