From 4f22ba83132721946728a110f568da982a1a9783 Mon Sep 17 00:00:00 2001 From: Liam Cardenas Date: Sat, 9 Dec 2017 12:06:33 -0800 Subject: [PATCH 1/7] =?UTF-8?q?Bump=20version:=200.19.0rc1=20=E2=86=92=200?= =?UTF-8?q?.19.0rc2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index be19078df..86b209b8a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.19.0rc1 +current_version = 0.19.0rc2 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)((?P[a-z]+)(?P\d+))? diff --git a/package.json b/package.json index 22ef2395c..3a3129c22 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "LBRY", - "version": "0.19.0rc1", + "version": "0.19.0rc2", "description": "A browser for the LBRY network, a digital marketplace controlled by its users.", "author": { "name": "LBRY Inc.", -- 2.45.2 From f28cdd010c6b5c5beec631f7a977f58c18e70811 Mon Sep 17 00:00:00 2001 From: Igor Gassmann Date: Sun, 10 Dec 2017 13:58:46 -0300 Subject: [PATCH 2/7] Move Windows installation path back to Program Files --- electron-builder.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/electron-builder.json b/electron-builder.json index 0939aa4df..acf8e77a2 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -50,5 +50,8 @@ "libsecret-1-0" ] }, + "nsis": { + "perMachine": true + }, "artifactName": "${productName}_${version}_${arch}.${ext}" } -- 2.45.2 From ce72b337de58686add9e0154569f1a2addd8b3b0 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Sun, 10 Dec 2017 13:21:40 -0500 Subject: [PATCH 3/7] =?UTF-8?q?Bump=20version:=200.19.0rc2=20=E2=86=92=200?= =?UTF-8?q?.19.0rc3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 86b209b8a..752030ff4 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.19.0rc2 +current_version = 0.19.0rc3 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)((?P[a-z]+)(?P\d+))? diff --git a/package.json b/package.json index 3a3129c22..8161d455b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "LBRY", - "version": "0.19.0rc2", + "version": "0.19.0rc3", "description": "A browser for the LBRY network, a digital marketplace controlled by its users.", "author": { "name": "LBRY Inc.", -- 2.45.2 From 800cc4318a71387767fb53f6a85a89d8cccc3c80 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Sun, 10 Dec 2017 13:26:21 -0500 Subject: [PATCH 4/7] add @icon to subscribe button --- src/renderer/component/link/view.jsx | 4 +++- src/renderer/component/subscribeButton/view.jsx | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/renderer/component/link/view.jsx b/src/renderer/component/link/view.jsx index c9355f84d..cfb2a731b 100644 --- a/src/renderer/component/link/view.jsx +++ b/src/renderer/component/link/view.jsx @@ -8,6 +8,7 @@ const Link = props => { style, label, icon, + iconRight, button, disabled, children, @@ -36,8 +37,9 @@ const Link = props => { } else { content = ( - {"icon" in props ? : null} + {icon ? : null} {label ? {label} : null} + {iconRight ? : null} ); } diff --git a/src/renderer/component/subscribeButton/view.jsx b/src/renderer/component/subscribeButton/view.jsx index 4f8e1a72a..c4c08628c 100644 --- a/src/renderer/component/subscribeButton/view.jsx +++ b/src/renderer/component/subscribeButton/view.jsx @@ -23,6 +23,7 @@ export default ({ return channelName && uri ? (
subscriptionHandler({ -- 2.45.2 From 343961679d0cb567df86ad2df45dfffc918b1ea8 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Sun, 10 Dec 2017 13:32:05 -0500 Subject: [PATCH 5/7] add link style to channel on subscriptions page --- src/renderer/page/discover/view.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/page/discover/view.jsx b/src/renderer/page/discover/view.jsx index 0277d92d0..47919e542 100644 --- a/src/renderer/page/discover/view.jsx +++ b/src/renderer/page/discover/view.jsx @@ -182,7 +182,7 @@ export class FeaturedCategory extends React.PureComponent {

{categoryLink ? ( Date: Sun, 10 Dec 2017 13:33:14 -0500 Subject: [PATCH 6/7] don't touch you --- src/renderer/modal/modalEmailCollection/view.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/modal/modalEmailCollection/view.jsx b/src/renderer/modal/modalEmailCollection/view.jsx index 8c0c40555..422c4c080 100644 --- a/src/renderer/modal/modalEmailCollection/view.jsx +++ b/src/renderer/modal/modalEmailCollection/view.jsx @@ -33,7 +33,7 @@ class ModalEmailCollection extends React.PureComponent {

- Can We Touch You Stay In Touch? + Can We Stay In Touch?

{this.renderInner()}
-- 2.45.2 From 206b2794e8986bb3c605e7558b4b42a2c1996930 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Sun, 10 Dec 2017 13:56:34 -0500 Subject: [PATCH 7/7] fix height for shapeshift tx info --- src/renderer/scss/component/_shapeshift.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/scss/component/_shapeshift.scss b/src/renderer/scss/component/_shapeshift.scss index cb69676a7..6e12a0522 100644 --- a/src/renderer/scss/component/_shapeshift.scss +++ b/src/renderer/scss/component/_shapeshift.scss @@ -13,7 +13,7 @@ } .shapeshift__tx-info { - min-height: 55px; + min-height: 63px; } .shapeshift__deposit-address-wrapper { -- 2.45.2