LBRYFoundation/lbry-desktop
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbry-desktop.git synced 2025-09-01 17:55:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into refresh-fix

Browse source
This commit is contained in:
Jeremy Kauffman 2017-07-24 17:31:12 -04:00 • committed by GitHub
commit e6b28e55f6
6 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -32,6 +32,7 @@ Web UI version numbers should always match the corresponding version of LBRY App
* Fixed downloading files that are deleted not being removed from the downloading list * Fixed downloading files that are deleted not being removed from the downloading list
* Fixed download progress bar not being cleared when a downloading file is deleted * Fixed download progress bar not being cleared when a downloading file is deleted
* Fixed refresh regression after adding scroll position to history state * Fixed refresh regression after adding scroll position to history state
* Fixed app thinking downloads with 0 progress were downloaded after restart
### Deprecated ### Deprecated
* *

4
build/build.ps1
View file

@ -46,8 +46,8 @@ dir dist # verify that binary was built/named correctly
# sign binary # sign binary
nuget install secure-file -ExcludeVersion nuget install secure-file -ExcludeVersion
secure-file\tools\secure-file -decrypt build\lbry2.pfx.enc -secret "$env:pfx_key" secure-file\tools\secure-file -decrypt build\lbry3.pfx.enc -secret "$env:pfx_key"
& ${env:SIGNTOOL_PATH} sign /f build\lbry2.pfx /p "$env:key_pass" /tr http://tsa.starfieldtech.com /td SHA256 /fd SHA256 dist\*.exe & ${env:SIGNTOOL_PATH} sign /f build\lbry3.pfx /p "$env:key_pass" /tr http://tsa.starfieldtech.com /td SHA256 /fd SHA256 dist\*.exe
python build\upload_assets.py python build\upload_assets.py

BIN
build/lbry2.pfx.enc
View file

Binary file not shown.

BIN
build/lbry3.pfx.enc Normal file
View file

Binary file not shown.

5
ui/js/component/fileActions/view.jsx
View file

@ -118,7 +118,10 @@ class FileActions extends React.PureComponent {
/> />
</div> </div>
); );
} else if (fileInfo === null && !downloading) { } else if (
(fileInfo === null || (fileInfo && fileInfo.written_bytes === 0)) &&
!downloading
) {
if (!costInfo) { if (!costInfo) {
content = <BusyMessage message={__("Fetching cost info")} />; content = <BusyMessage message={__("Fetching cost info")} />;
} else { } else {

3
ui/js/component/userEmailVerify/view.jsx
View file

@ -35,7 +35,6 @@ class UserEmailVerify extends React.PureComponent {
<FormRow <FormRow
type="text" type="text"
label={__("Verification Code")} label={__("Verification Code")}
placeholder="a94bXXXXXXXXXXXXXX"
name="code" name="code"
value={this.state.code} value={this.state.code}
onChange={event => { onChange={event => {
@ -46,7 +45,7 @@ class UserEmailVerify extends React.PureComponent {
{/* render help separately so it always shows */} {/* render help separately so it always shows */}
<div className="form-field__helper"> <div className="form-field__helper">
<p> <p>
{__("Email")}{" "} {__("Check your email for a verification code. Email")}{" "}
<Link href="mailto:help@lbry.io" label="help@lbry.io" />{" "} <Link href="mailto:help@lbry.io" label="help@lbry.io" />{" "}
{__("if you did not receive or are having trouble with your code.")} {__("if you did not receive or are having trouble with your code.")}
</p> </p>