From 2e3ea9e2ae08a6f461d5e55194a084691f606fcc Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Thu, 7 Sep 2017 17:21:23 -0400 Subject: [PATCH 1/7] update daemon version --- CHANGELOG.md | 7 +++---- app/package.json | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cec1d9f56..3433f889c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,18 +8,17 @@ Web UI version numbers should always match the corresponding version of LBRY App ## [Unreleased] ### Added - * File pages now show the time of a publish. - * The "auth token" displayable on Help offers security warning - * Added a new component for rendering dates and times. This component can render the date and time of a block height, as well. + * File pages now show the time of a publish. This includes a new component for rendering dates and times that can render the date and time of a block height, as well. ### Changed - * + * Updated to daemon [0.15.2](https://github.com/lbryio/lbry/releases/tag/v0.15.2) to prevent a bug in USD purchases. * ### Fixed * Potential fix for blank error popup when streaming (#536) * Fixed some popups showing improperly while balance was loading (#534) + * Show a security warning when the auth token is displayed on Help. * Some CSS changes to prevent the card row from clipping the scroll arrows after the window width is reduced below a certain point * Clearly notify user when they try to send credits to an invalid address (#445) diff --git a/app/package.json b/app/package.json index e1293e5ac..77fe075a0 100644 --- a/app/package.json +++ b/app/package.json @@ -20,7 +20,7 @@ "electron-rebuild": "^1.5.11" }, "lbrySettings": { - "lbrynetDaemonVersion": "0.15.1", + "lbrynetDaemonVersion": "0.15.2", "lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-daemon-vDAEMONVER-OSNAME.zip" }, "license": "MIT" From 6e5cc922ba2b4e130c3345e2d75cf4c1d2d7ee3b Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Thu, 7 Sep 2017 17:21:41 -0400 Subject: [PATCH 2/7] =?UTF-8?q?Bump=20version:=200.15.0=20=E2=86=92=200.15?= =?UTF-8?q?.1rc1?= 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 eae458369..082e90615 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.15.0 +current_version = 0.15.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 77fe075a0..e47b75897 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "LBRY", - "version": "0.15.0", + "version": "0.15.1rc1", "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 3dc9384a3..6680cbe9c 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "lbry-web-ui", - "version": "0.15.0", + "version": "0.15.1rc1", "description": "LBRY UI", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", From 6ae6c8b73637ec503e37940f99f6f5808f67cb0f Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Thu, 7 Sep 2017 17:44:56 -0400 Subject: [PATCH 3/7] =?UTF-8?q?Bump=20version:=200.15.1rc1=20=E2=86=92=200?= =?UTF-8?q?.15.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 082e90615..1987baffb 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.15.1rc1 +current_version = 0.15.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 e47b75897..452e251fb 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "LBRY", - "version": "0.15.1rc1", + "version": "0.15.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 6680cbe9c..23d5caa13 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "lbry-web-ui", - "version": "0.15.1rc1", + "version": "0.15.1rc2", "description": "LBRY UI", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", From 9cb28e8f46f65580b5bf17cdcfd3bdd93587e795 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Fri, 8 Sep 2017 09:48:40 -0400 Subject: [PATCH 4/7] =?UTF-8?q?Bump=20version:=200.15.1rc2=20=E2=86=92=200?= =?UTF-8?q?.15.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- CHANGELOG.md | 32 ++++++++++++++++++++++++-------- app/package.json | 2 +- ui/package.json | 2 +- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 1987baffb..b00c73445 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.15.1rc2 +current_version = 0.15.1 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)((?P[a-z]+)(?P\d+))? diff --git a/CHANGELOG.md b/CHANGELOG.md index 3433f889c..331fb8d39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,19 +8,16 @@ Web UI version numbers should always match the corresponding version of LBRY App ## [Unreleased] ### Added - * File pages now show the time of a publish. This includes a new component for rendering dates and times that can render the date and time of a block height, as well. - + * + * ### Changed - * Updated to daemon [0.15.2](https://github.com/lbryio/lbry/releases/tag/v0.15.2) to prevent a bug in USD purchases. + * * ### Fixed - * Potential fix for blank error popup when streaming (#536) - * Fixed some popups showing improperly while balance was loading (#534) - * Show a security warning when the auth token is displayed on Help. - * Some CSS changes to prevent the card row from clipping the scroll arrows after the window width is reduced below a certain point - * Clearly notify user when they try to send credits to an invalid address (#445) + * + * ### Deprecated * @@ -30,6 +27,25 @@ Web UI version numbers should always match the corresponding version of LBRY App * * +## [0.15.1] - 2017-09-08 + +### Added + * File pages now show the time of a publish. This includes a new component for rendering dates and times that can render the date and time of a block height, as well. + + +### Changed + * Updated to daemon [0.15.2](https://github.com/lbryio/lbry/releases/tag/v0.15.2) to prevent a bug in USD purchases. + + +### Fixed + * Potential fix for blank error popup when streaming (#536) + * Fixed some popups showing improperly while balance was loading (#534) + * Show a security warning when the auth token is displayed on Help. + * Some CSS changes to prevent the card row from clipping the scroll arrows after the window width is reduced below a certain point + * Clearly notify user when they try to send credits to an invalid address (#445) + + + ## [0.15.0] - 2017-08-31 ### Added diff --git a/app/package.json b/app/package.json index 452e251fb..9c2b5d5fb 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "LBRY", - "version": "0.15.1rc2", + "version": "0.15.1", "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 23d5caa13..c0e6e73b5 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "lbry-web-ui", - "version": "0.15.1rc2", + "version": "0.15.1", "description": "LBRY UI", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", From be44455b7ab24f89c98f1ead74acdb279e1a3a9e Mon Sep 17 00:00:00 2001 From: MSFTserver Date: Fri, 8 Sep 2017 23:46:26 -0700 Subject: [PATCH 5/7] added color to echo's to stand out more --- build/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/build.sh b/build/build.sh index 92c2c5e8f..f73230469 100755 --- a/build/build.sh +++ b/build/build.sh @@ -14,7 +14,7 @@ if [ "$(uname)" == "Darwin" ]; then elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then LINUX=true else - echo "Platform detection failed" + echo -e "\033[1;31mPlatform detection failed\x1b[m" exit 1 fi @@ -90,7 +90,7 @@ if [[ ! -f $DAEMON_VER_PATH || ! -f $ROOT/app/dist/lbrynet-daemon || "$(< "$DAEM rm "$BUILD_DIR/daemon.zip" echo "$DAEMON_VER" > "$DAEMON_VER_PATH" else - echo "Already have daemon version $DAEMON_VER, skipping download" + echo -e "\033[4;31mAlready have daemon version $DAEMON_VER, skipping download\x1b[m" fi @@ -133,7 +133,7 @@ if [ "$FULL_BUILD" == "true" ]; then deactivate - echo 'Build and packaging complete.' + echo -e '\033[0;32mBuild and packaging complete.\x1b[m' else - echo 'Build complete. Run `./node_modules/.bin/electron app` to launch the app' + echo -e 'Build complete. Run \033[1;31m./node_modules/.bin/electron app\x1b[m to launch the app' fi From 716fc604f43ddaa34bf68afd08b7814c585fb175 Mon Sep 17 00:00:00 2001 From: gyroninja Date: Sat, 9 Sep 2017 21:47:46 -0700 Subject: [PATCH 6/7] Get the app directory via an absolute path instead of a relative one. Fixes #516 --- ui/js/actions/settings.js | 3 ++- ui/js/app.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ui/js/actions/settings.js b/ui/js/actions/settings.js index 7038fd284..195a42ece 100644 --- a/ui/js/actions/settings.js +++ b/ui/js/actions/settings.js @@ -4,6 +4,7 @@ import batchActions from "util/batchActions"; import lbry from "lbry"; import fs from "fs"; import http from "http"; +import { remote } from "electron"; export function doFetchDaemonSettings() { return function(dispatch, getState) { @@ -48,7 +49,7 @@ export function doSetClientSetting(key, value) { export function doDownloadLanguage(langFile) { return function(dispatch, getState) { - const destinationPath = `app/locales/${langFile}`; + const destinationPath = app.i18n.directory + "/" + langFile; const language = langFile.replace(".json", ""); const req = http.get( { diff --git a/ui/js/app.js b/ui/js/app.js index ecbb5f83c..0aa908904 100644 --- a/ui/js/app.js +++ b/ui/js/app.js @@ -1,5 +1,6 @@ import store from "store.js"; import lbry from "./lbry.js"; +import { remote } from "electron"; import * as settings from "constants/settings"; const env = ENV; @@ -10,7 +11,7 @@ const language = lbry.getClientSetting(settings.LANGUAGE) ? lbry.getClientSetting(settings.LANGUAGE) : "en"; const i18n = require("y18n")({ - directory: "app/locales", + directory: remote.app.getAppPath() + "/locales", updateFiles: false, locale: language, }); From 5c56de8034f8bb8595af8f566069007ac6764625 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Mon, 11 Sep 2017 18:23:17 -0400 Subject: [PATCH 7/7] remove unused import --- ui/js/actions/settings.js | 1 - 1 file changed, 1 deletion(-) diff --git a/ui/js/actions/settings.js b/ui/js/actions/settings.js index 195a42ece..21e27f1fb 100644 --- a/ui/js/actions/settings.js +++ b/ui/js/actions/settings.js @@ -4,7 +4,6 @@ import batchActions from "util/batchActions"; import lbry from "lbry"; import fs from "fs"; import http from "http"; -import { remote } from "electron"; export function doFetchDaemonSettings() { return function(dispatch, getState) {