From 27e848125e9df5628fde4d0fa76f6501ded70b0e Mon Sep 17 00:00:00 2001 From: Denis Davidyuk Date: Wed, 26 Feb 2020 19:32:39 +1000 Subject: [PATCH 1/6] popup: Add missed plugin --- src/popup.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/popup.js b/src/popup.js index e5594f7bb..8c8d008f5 100644 --- a/src/popup.js +++ b/src/popup.js @@ -5,11 +5,12 @@ import store from './store'; import languages, { i18n } from './store/plugins/ui/languages'; import initSdk from './store/plugins/initSdk'; import names from './store/plugins/ui/names'; +import appsMetadata from './store/plugins/ui/appsMetadata'; import ConfirmAccountAccess from './components/ConfirmAccountAccess.vue'; Vue.use(Vuex); -[languages, initSdk, names].forEach(plugin => plugin(store)); +[languages, initSdk, names, appsMetadata].forEach(plugin => plugin(store)); const unloadHandler = () => { window.reject(new Error('Rejected by user')); From ef7d161563b7b2ea5caea72d0741e23bd3771282 Mon Sep 17 00:00:00 2001 From: Denis Davidyuk Date: Mon, 16 Mar 2020 16:17:07 +1000 Subject: [PATCH 2/6] current-branch: Don't handle tag as a branch --- scripts/current-branch.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/current-branch.js b/scripts/current-branch.js index 909e70bfd..ac9179cf9 100644 --- a/scripts/current-branch.js +++ b/scripts/current-branch.js @@ -1,6 +1,11 @@ const { execSync } = require('child_process'); -const branch = process.env.TRAVIS_BRANCH - || execSync('git rev-parse --abbrev-ref HEAD').toString().trim(); +const { TRAVIS, TRAVIS_BRANCH, TRAVIS_TAG } = process.env; + +const travisBranch = TRAVIS_BRANCH === TRAVIS_TAG ? 'master' : TRAVIS_BRANCH; + +const branch = TRAVIS + ? travisBranch + : execSync('git rev-parse --abbrev-ref HEAD').toString().trim(); module.exports = branch; From 77f900dd27768dbf8d8dbeaf726c58f430a678e4 Mon Sep 17 00:00:00 2001 From: Denis Davidyuk Date: Mon, 16 Mar 2020 16:19:41 +1000 Subject: [PATCH 3/6] travis: Disable caching that is enabled by default https://docs.travis-ci.com/user/languages/javascript-with-nodejs/#caching-with-npm --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cfb8bec0d..09295a0a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,6 @@ matrix: cache: directories: - - node_modules - platforms - plugins - /home/travis/.cache/Cypress From a062e0457dd04899b376ac412c4fbc9426dc348b Mon Sep 17 00:00:00 2001 From: Denis Davidyuk Date: Mon, 16 Mar 2020 16:21:11 +1000 Subject: [PATCH 4/6] Put iOS site association to the same folder as for Android --- public/{ => .well-known}/apple-app-site-association | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename public/{ => .well-known}/apple-app-site-association (100%) diff --git a/public/apple-app-site-association b/public/.well-known/apple-app-site-association similarity index 100% rename from public/apple-app-site-association rename to public/.well-known/apple-app-site-association From 29ff01420778700b5f9344473931cbcce6dca2f3 Mon Sep 17 00:00:00 2001 From: Denis Davidyuk Date: Mon, 16 Mar 2020 16:23:10 +1000 Subject: [PATCH 5/6] Fix deeplinks on Android by using a custom version of ionic-plugin-deeplinks package --- config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.xml b/config.xml index d7ee29895..268bdd215 100644 --- a/config.xml +++ b/config.xml @@ -62,7 +62,7 @@ - + From bd4957c01437f3b22595faea08a9a9f4dfb5cdd3 Mon Sep 17 00:00:00 2001 From: Denis Davidyuk Date: Tue, 17 Mar 2020 14:33:08 +1000 Subject: [PATCH 6/6] 0.23.1 --- config.xml | 2 +- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config.xml b/config.xml index 268bdd215..19fb9946e 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + Base æpp aeternity developers diff --git a/package-lock.json b/package-lock.json index 3d768329c..6434253a2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "aepp-base", - "version": "0.23.0", + "version": "0.23.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 37bfb1853..dcfd213d7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aepp-base", - "version": "0.23.0", + "version": "0.23.1", "author": "Sascha Hanse ", "private": true, "scripts": {