From 1c0200f94d074dcf32bf31bd8c75cbd49199c1ad Mon Sep 17 00:00:00 2001 From: xenohunter Date: Fri, 12 May 2017 17:25:30 +0300 Subject: [PATCH 1/3] chore(version): bumping version v0.4.19 --- bower.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index ec82bc8980..76ad1282b1 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "waves-lite-client", - "version": "0.4.18", + "version": "0.4.19", "dependencies": { "angular": "~1.6.0", "angular-route": "~1.6.0", diff --git a/package.json b/package.json index 8f785b3670..65d4cb39f0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "waves-lite-client", - "version": "0.4.18", + "version": "0.4.19", "description": "A lite client for the Waves platform", "license": "See license in ./LICENSE", "engines": { From f865e44c585ba6ff446c0d22972445313694a8d9 Mon Sep 17 00:00:00 2001 From: xenohunter Date: Fri, 12 May 2017 17:41:28 +0300 Subject: [PATCH 2/3] HTTP to HTTPS --- src/js/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/app.js b/src/js/app.js index c00e768f8e..7eb3b635db 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -54,7 +54,7 @@ function AngularApplicationConfig($provide, $compileProvider, $validatorProvider 'self', 'https://test.coinomat.com/api/**', 'https://coinomat.com/api/**', - 'http://marketdata.wavesplatform.com/**' + 'https://marketdata.wavesplatform.com/**' ]); // Globally disables all ARIA warnings. From 586ea39cb47c8ace473b301781cf4685d4dbddaa Mon Sep 17 00:00:00 2001 From: xenohunter Date: Fri, 12 May 2017 18:09:20 +0300 Subject: [PATCH 3/3] Build process fix --- Gruntfile.js | 10 +++++++--- src/js/app.js | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 2831aba37a..3317c1b15d 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -10,6 +10,7 @@ module.exports = function (grunt) { .replace(/NETWORK_NAME\s*:\s*'[^']+'/, grunt.template.process("NETWORK_NAME: '<%= meta.configurations." + target + ".name %>'")) .replace(/NETWORK_CODE\s*:\s*'[^']+'/, grunt.template.process("NETWORK_CODE: '<%= meta.configurations." + target + ".code %>'")) .replace(/COINOMAT_ADDRESS\s*:\s*'[^']+'/, grunt.template.process("COINOMAT_ADDRESS: '<%= meta.configurations." + target + ".coinomat %>'")) + .replace(/DATAFEED_ADDRESS\s*:\s*'[^']+'/, grunt.template.process("DATAFEED_ADDRESS: '<%= meta.configurations." + target + ".datafeed %>'")) .replace(/MATCHER_ADDRESS\s*:\s*'[^']+'/, grunt.template.process("MATCHER_ADDRESS: '<%= meta.configurations." + target + ".matcher %>'")); }; @@ -86,21 +87,24 @@ module.exports = function (grunt) { code: 'T', server: 'http://52.30.47.67:6869', coinomat: 'https://test.coinomat.com', - matcher: 'http://52.28.66.217:6886' + matcher: 'http://52.28.66.217:6886', + datafeed: 'http://marketdata.wavesplatform.com' }, mainnet: { name: 'mainnet', code: 'W', server: 'https://nodes.wavesnodes.com', coinomat: 'https://coinomat.com', - matcher: 'https://nodes.wavesnodes.com' + matcher: 'https://nodes.wavesnodes.com', + datafeed: 'https://marketdata.wavesplatform.com' }, devnet: { name: 'devnet', code: 'D', server: 'http://35.157.212.173:6869', coinomat: 'https://test.coinomat.com', - matcher: 'http://52.28.66.217:6886' + matcher: 'http://52.28.66.217:6886', + datafeed: 'http://marketdata.wavesplatform.com' }, chrome: { testnet: { diff --git a/src/js/app.js b/src/js/app.js index 7eb3b635db..752a53731f 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -54,6 +54,7 @@ function AngularApplicationConfig($provide, $compileProvider, $validatorProvider 'self', 'https://test.coinomat.com/api/**', 'https://coinomat.com/api/**', + 'http://marketdata.wavesplatform.com/**', 'https://marketdata.wavesplatform.com/**' ]);