Merge remote-tracking branch 'origin/master' into v16

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.15.0
+current_version = 0.15.1
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<candidate>\d+))?

CHANGELOG.md

@@ -19,10 +19,8 @@ Web UI version numbers should always match the corresponding version of LBRY App
   *
 
 ### Fixed
-  * Potential fix for blank error popup when streaming (#536)
-  * Fixed some popups showing improperly while balance was loading (#534)
-  * 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
   *
@@ -32,6 +30,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

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "LBRY",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "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.0rc5",
+    "lbrynetDaemonVersion": "0.16.0rc8",
     "lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-daemon-vDAEMONVER-OSNAME.zip"
   },
   "license": "MIT"

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

ui/js/actions/settings.js

@@ -75,7 +75,7 @@ export function doGetThemes() {
 
 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(
       {

ui/js/app.js

@@ -1,11 +1,12 @@
 import store from "store.js";
+import { remote } from "electron";
 
 const env = ENV;
 const config = {
   ...require(`./config/${env}`),
 };
 const i18n = require("y18n")({
-  directory: "app/locales",
+  directory: remote.app.getAppPath() + "/locales",
   updateFiles: false,
   locale: "en",
 });

ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lbry-web-ui",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "description": "LBRY UI",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",