From 6759f9c3204dac6c5ddeaaf2395f852206ae8ad4 Mon Sep 17 00:00:00 2001
From: Thomas Zarebczan
Date: Mon, 2 Oct 2017 11:20:14 -0400
Subject: [PATCH 1/4] update disabled reward text
This message appears when a user's account is manually disabled (rewards abuse, etc). We don't reach out to them via email, so we should ask them to reach out if they are actually legitimate users.
---
ui/js/page/rewards/view.jsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui/js/page/rewards/view.jsx b/ui/js/page/rewards/view.jsx
index 423d45faa..9f421b76d 100644
--- a/ui/js/page/rewards/view.jsx
+++ b/ui/js/page/rewards/view.jsx
@@ -75,7 +75,7 @@ class RewardsPage extends React.PureComponent {
)}
- {__("You will receive an email when this process is complete.") +
+ {__("If you continue to see this message, send us an email to help@lbry.io.") +
" " +
__("Please enjoy free content in the meantime!")}
From 37eb4ef6f87bdbd96848a6522e8f28707b970b13 Mon Sep 17 00:00:00 2001
From: Alex Grintsvayg
Date: Mon, 2 Oct 2017 17:38:24 -0400
Subject: [PATCH 2/4] bump daemon version
---
app/package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/package.json b/app/package.json
index 0b89f2a1e..9b2d92a36 100644
--- a/app/package.json
+++ b/app/package.json
@@ -20,7 +20,7 @@
"electron-rebuild": "^1.5.11"
},
"lbrySettings": {
- "lbrynetDaemonVersion": "0.16.3",
+ "lbrynetDaemonVersion": "0.16.4",
"lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-daemon-vDAEMONVER-OSNAME.zip"
},
"license": "MIT"
From 4c0cc5e7c857dc16fce76bfa3176335a3e78d5c6 Mon Sep 17 00:00:00 2001
From: Alex Grintsvayg
Date: Mon, 2 Oct 2017 17:39:24 -0400
Subject: [PATCH 3/4] =?UTF-8?q?Bump=20version:=200.16.1rc1=20=E2=86=92=200?=
=?UTF-8?q?.16.1rc2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.bumpversion.cfg | 2 +-
app/package.json | 2 +-
ui/package.json | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 8f0a3e7b2..15a94f805 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 0.16.1rc1
+current_version = 0.16.1rc2
commit = True
tag = True
parse = (?P\d+)\.(?P\d+)\.(?P\d+)((?P[a-z]+)(?P\d+))?
diff --git a/app/package.json b/app/package.json
index 9b2d92a36..2ff65ea99 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
{
"name": "LBRY",
- "version": "0.16.1rc1",
+ "version": "0.16.1rc2",
"main": "main.js",
"description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
"author": {
diff --git a/ui/package.json b/ui/package.json
index 953ae7d70..640942e2b 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -1,6 +1,6 @@
{
"name": "lbry-web-ui",
- "version": "0.16.1rc1",
+ "version": "0.16.1rc2",
"description": "LBRY UI",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
From 5168cb950c6448bad1803dffaba0e0f4439132c6 Mon Sep 17 00:00:00 2001
From: Alex Grintsvayg
Date: Mon, 2 Oct 2017 17:51:33 -0400
Subject: [PATCH 4/4] =?UTF-8?q?Revert=20"Bump=20version:=200.16.1rc1=20?=
=?UTF-8?q?=E2=86=92=200.16.1rc2"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit 4c0cc5e7c857dc16fce76bfa3176335a3e78d5c6.
Revert "bump daemon version"
This reverts commit 37eb4ef6f87bdbd96848a6522e8f28707b970b13.
---
.bumpversion.cfg | 2 +-
app/package.json | 4 ++--
ui/package.json | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 15a94f805..8f0a3e7b2 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 0.16.1rc2
+current_version = 0.16.1rc1
commit = True
tag = True
parse = (?P\d+)\.(?P\d+)\.(?P\d+)((?P[a-z]+)(?P\d+))?
diff --git a/app/package.json b/app/package.json
index 2ff65ea99..0b89f2a1e 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,6 +1,6 @@
{
"name": "LBRY",
- "version": "0.16.1rc2",
+ "version": "0.16.1rc1",
"main": "main.js",
"description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
"author": {
@@ -20,7 +20,7 @@
"electron-rebuild": "^1.5.11"
},
"lbrySettings": {
- "lbrynetDaemonVersion": "0.16.4",
+ "lbrynetDaemonVersion": "0.16.3",
"lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-daemon-vDAEMONVER-OSNAME.zip"
},
"license": "MIT"
diff --git a/ui/package.json b/ui/package.json
index 640942e2b..953ae7d70 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -1,6 +1,6 @@
{
"name": "lbry-web-ui",
- "version": "0.16.1rc2",
+ "version": "0.16.1rc1",
"description": "LBRY UI",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",