LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

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

Browse source
This commit is contained in:
Jeremy Kauffman 2017-09-11 18:46:21 -04:00
commit 13d61651c9
7 changed files with 32 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.bumpversion.cfg
View file

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

25
CHANGELOG.md
View file

@ -19,10 +19,8 @@ Web UI version numbers should always match the corresponding version of LBRY App
* *
### Fixed ### 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 ### 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 ## [0.15.0] - 2017-08-31
### Added ### Added

4
app/package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "LBRY", "name": "LBRY",
"version": "0.15.0", "version": "0.15.1",
"main": "main.js", "main": "main.js",
"description": "A browser for the LBRY network, a digital marketplace controlled by its users.", "description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
"author": { "author": {
@ -20,7 +20,7 @@
"electron-rebuild": "^1.5.11" "electron-rebuild": "^1.5.11"
}, },
"lbrySettings": { "lbrySettings": {
"lbrynetDaemonVersion": "0.16.0rc5", "lbrynetDaemonVersion": "0.16.0rc8",
"lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-daemon-vDAEMONVER-OSNAME.zip" "lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-daemon-vDAEMONVER-OSNAME.zip"
}, },
"license": "MIT" "license": "MIT"

8
build/build.sh
View file

@ -14,7 +14,7 @@ if [ "$(uname)" == "Darwin" ]; then
elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
LINUX=true LINUX=true
else else
echo "Platform detection failed" echo -e "\033[1;31mPlatform detection failed\x1b[m"
exit 1 exit 1
fi fi
@ -90,7 +90,7 @@ if [[ ! -f $DAEMON_VER_PATH || ! -f $ROOT/app/dist/lbrynet-daemon || "$(< "$DAEM
rm "$BUILD_DIR/daemon.zip" rm "$BUILD_DIR/daemon.zip"
echo "$DAEMON_VER" > "$DAEMON_VER_PATH" echo "$DAEMON_VER" > "$DAEMON_VER_PATH"
else 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 fi
@ -133,7 +133,7 @@ if [ "$FULL_BUILD" == "true" ]; then
deactivate deactivate
echo 'Build and packaging complete.' echo -e '\033[0;32mBuild and packaging complete.\x1b[m'
else 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 fi

2
ui/js/actions/settings.js
View file

@ -75,7 +75,7 @@ export function doGetThemes() {
export function doDownloadLanguage(langFile) { export function doDownloadLanguage(langFile) {
return function(dispatch, getState) { return function(dispatch, getState) {
const destinationPath = `app/locales/${langFile}`; const destinationPath = app.i18n.directory + "/" + langFile;
const language = langFile.replace(".json", ""); const language = langFile.replace(".json", "");
const req = http.get( const req = http.get(
{ {

3
ui/js/app.js
View file

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

2
ui/package.json
View file

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