Merge pull request #1738 from lbryio/release-0-22-1

Merge release branch into master
This commit is contained in:
Sean Yesmunt 2018-07-08 15:36:59 -04:00 committed by GitHub
commit e477801020
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions

View file

@ -20,7 +20,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
### Changed
* Show claim name, instead of URI, when loading a channel([#1711](https://github.com/lbryio/lbry-app/pull/1711))
* Updated LBRY daemon to 0.20.3 which contains some availability improvements ([v0.20.3](https://github.com/lbryio/lbry/releases/tag/v0.20.3))
## [0.22.0] - 2018-06-26

View file

@ -1,6 +1,6 @@
{
"name": "LBRY",
"version": "0.22.0",
"version": "0.22.1",
"description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
"keywords": [
"lbry"
@ -127,7 +127,7 @@
"yarn": "^1.3"
},
"lbrySettings": {
"lbrynetDaemonVersion": "0.20.3rc1",
"lbrynetDaemonVersion": "0.20.3",
"lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-daemon-vDAEMONVER-OSNAME.zip",
"lbrynetDaemonDir": "static/daemon",
"lbrynetDaemonFileName": "lbrynet-daemon"

View file

@ -401,7 +401,7 @@ class PublishForm extends React.PureComponent<Props> {
) : (
<React.Fragment>
{__(
'Upload your thumbnail (.png/.jpg/.gif) to spee.ch, or enter the URL manually. Learn more about spee.ch '
'Upload your thumbnail (.png/.jpg/.jpeg/.gif) to spee.ch, or enter the URL manually. Learn more about spee.ch '
)}
<Button button="link" label={__('here')} href="https://spee.ch/about" />.
</React.Fragment>

View file

@ -182,7 +182,7 @@ class FilePage extends React.Component<Props> {
<UriIndicator uri={uri} link />
</div>
<div className="card__actions card__actions--no-margin card__actions--between">
{(claimIsMine || subscriptionUri || speechSharable) && (
{(!claimIsMine || subscriptionUri || speechSharable) && (
<div className="card__actions">
{claimIsMine ? (
<Button