Merge branch 'release/2.0.0-beta15'

wordpress-clients · Nov 1, 2016 · 5e6b0dc · 5e6b0dc
2 parents 8ddc2fc + e645608
commit 5e6b0dc
Show file tree

Hide file tree

Showing 6 changed files with 7,344 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,13 @@
 * [CONFIG] There is no more dev/prod distinction, WPHC turn debug OFF when building the prod app automatically.
 * [ABOUT] The About feature has been removed. You can use Pages to achieve the same purpose.
 
+<a name="2.0.0-beta15"></a>
+### 2.0.0-beta15 (2016-11-01)
+
+To upgrade checkout `git fetch --all && git checkout v2.0.0-beta15` and run `npm i`
+
+* [BUG] Remove Object.assign ... <https://github.com/shprink/wordpress-hybrid-client/issues/294>
+
 <a name="2.0.0-beta14"></a>
 ### 2.0.0-beta14 (2016-10-30)
 

diff --git a/INSTALLATION.md b/INSTALLATION.md
@@ -32,7 +32,7 @@ The installation will not install anything globally to avoid potential version c
 
 ```
 # install dependencies
-npm install
+yarn
 ```
 
 This could takes several minutes.

diff --git a/README.md b/README.md
@@ -68,6 +68,7 @@
 - Git
 - NodeJS (>= 4)
 - NPM (>= 3)
+- [Yarn](https://yarnpkg.com/en/docs/install)
 
 This installation works on both OSX and Linux. Windows is not supported yet,
 
@@ -79,7 +80,7 @@ $ git tag
 $ git checkout <the-latest-version>
 
 # Install
-$ npm install
+$ yarn
 
 # Run on the browser
 $ npm start

diff --git a/lib/abstract/AbstractList.js b/lib/abstract/AbstractList.js
@@ -74,7 +74,7 @@ export default class {
         } else if (this.type === 'taxonomiesPosts' && this.postType) {
             typeQuery = _.get(this.config, `[${this.postType}].query`, {})
         }
-        return Object.assign(this.getQuery(), typeQuery);
+        return angular.merge(this.getQuery(), typeQuery);
     }
 
     setType(type = null) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wordpress-hybrid-client",
-  "version": "2.0.0-beta14",
+  "version": "2.0.0-beta15",
   "title": "wordpress-hybrid-client",
   "description": "AngularJS client using Ionic Framework and based on the json-rest-api plugin: https://wordpress.org/plugins/json-rest-api/ with CORS enabled.",
   "main": "index.js",
-Original file line number
+Diff line change
@@ Expand Up @@
     ```
     # install dependencies
-    npm install
+    yarn
     ```
     This could takes several minutes.
@@ Expand Down @@