Merge branch 'master' into fix/MTC-30488

Conflicts:
      mt-static/data-api/v7/js/mt-data-api.min.js

this conflict was resolved by executing "make build" command

Author: masiuchi

mt-static/data-api/v7/js/mt-data-api.js

@@ -1,5 +1,5 @@
 /*
- * Movable Type DataAPI SDK for JavaScript v6
+ * Movable Type DataAPI SDK for JavaScript v7
  * https://github.com/movabletype/mt-data-api-sdk-js
  * Copyright (c) Six Apart Ltd.
  * This program is distributed under the terms of the MIT license.
@@ -140,7 +140,7 @@ var DataAPI = function(options) {
  * @private
  * @type Number
  */
-DataAPI.version = 6;
+DataAPI.version = 7;
 
 /**
  * The key of access token of this api object.

mt-static/data-api/v7/js/mt-data-api.min.js

@@ -1,5 +1,5 @@
 /*
- * Movable Type DataAPI SDK for JavaScript v6
+ * Movable Type DataAPI SDK for JavaScript v7
  * https://github.com/movabletype/mt-data-api-sdk-js
  * Copyright (c) Six Apart Ltd.
  * This program is distributed under the terms of the MIT license.
@@ -148,7 +148,7 @@ var DataAPI = function(options) {
  * @private
  * @type Number
  */
-DataAPI.version = 6;
+DataAPI.version = 7;
 
 /**
  * The key of access token of this api object.

node-lib/data-api/v7/node-mt-data-api.js

@@ -471,7 +471,7 @@ describe("DataAPI Request", function(){
         });;
         api.request('GET', '/endpoint-test');
 
-        expect(url).toMatch(new RegExp(dataApiBaseUrl + '/v6/endpoint-test\\?_=\\d+'));
+        expect(url).toMatch(new RegExp(dataApiBaseUrl + '/v7/endpoint-test\\?_=\\d+'));
     });
 
     it("should be set timeout property if the timeout option is set", function(){
@@ -500,7 +500,7 @@ describe("DataAPI Request", function(){
         });;
         api.request('GET', '/endpoint-test');
 
-        expect(url).toEqual(dataApiBaseUrl + '/v6/endpoint-test?format=mpac');
+        expect(url).toEqual(dataApiBaseUrl + '/v7/endpoint-test?format=mpac');
     });
 
     it("should be set \"X-MT-Authorization\" request header if an accessToke is already set up", function(){

spec/data-api/common/core-request-spec.js

@@ -4,7 +4,7 @@ var path   = require("path"),
     lib    = path.join(base, "node-lib");
 
 global.MT = {
-    DataAPI: require(path.join(lib, "bootstrap"))["v6"]
+    DataAPI: require(path.join(lib, "bootstrap"))["v7"]
 };
 
 global.sinon  = require(path.join(base, "bower_components", "sinon"));

spec/helpers/node/node-helper.js

@@ -111,7 +111,7 @@ var DataAPI = function(options) {
  * @private
  * @type Number
  */
-DataAPI.version = 6;
+DataAPI.version = 7;
 
 /**
  * The key of access token of this api object.

src/data-api/common/core.js

@@ -1,5 +1,5 @@
 /*
- * Movable Type DataAPI SDK for JavaScript v6
+ * Movable Type DataAPI SDK for JavaScript v7
  * https://github.com/movabletype/mt-data-api-sdk-js
  * Copyright (c) Six Apart Ltd.
  * This program is distributed under the terms of the MIT license.