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

update lbry-redux

Browse source
This commit is contained in:
Sean Yesmunt 2019-11-14 13:03:28 -05:00
parent 97cb4ff3bc
commit 7f37d370dd
5 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -124,7 +124,7 @@
"imagesloaded": "^4.1.4", "imagesloaded": "^4.1.4",
"json-loader": "^0.5.4", "json-loader": "^0.5.4",
"lbry-format": "https://github.com/lbryio/lbry-format.git", "lbry-format": "https://github.com/lbryio/lbry-format.git",
"lbry-redux": "lbryio/lbry-redux#4491b975cc3e23bf3733272b7c6079a28c1036b3", "lbry-redux": "lbryio/lbry-redux#fcc9746ff7c81e6fe05f74dd99511775edc5ad9c",
"lbryinc": "lbryio/lbryinc#2aedf5a188f028f61c45bc7ed0c747a2d4ae453a", "lbryinc": "lbryio/lbryinc#2aedf5a188f028f61c45bc7ed0c747a2d4ae453a",
"lint-staged": "^7.0.2", "lint-staged": "^7.0.2",
"localforage": "^1.7.1", "localforage": "^1.7.1",

4
static/app-strings.json
View file

@ -871,5 +871,7 @@
"Sorry, your request timed out. %again%": "Sorry, your request timed out. %again%", "Sorry, your request timed out. %again%": "Sorry, your request timed out. %again%",
"If you continue to have issues, please %support%.": "If you continue to have issues, please %support%.", "If you continue to have issues, please %support%.": "If you continue to have issues, please %support%.",
"lbry.tv Account": "lbry.tv Account", "lbry.tv Account": "lbry.tv Account",
"Creating a lbry.tv account will allow you to earn rewards, receive content and security updates, and optionally backup your data.": "Creating a lbry.tv account will allow you to earn rewards, receive content and security updates, and optionally backup your data." "Creating a lbry.tv account will allow you to earn rewards, receive content and security updates, and optionally backup your data.": "Creating a lbry.tv account will allow you to earn rewards, receive content and security updates, and optionally backup your data.",
"Paid content cannot be embedded": "Paid content cannot be embedded",
"This content cannot be embedded": "This content cannot be embedded"
} }

1
ui/component/socialShare/view.jsx
View file

@ -56,7 +56,6 @@ class SocialShare extends React.PureComponent<Props> {
/> />
</div> </div>
{webShareable && !isChannel && <EmbedArea label={__('Embedded')} claim={claim} noSnackbar />} {webShareable && !isChannel && <EmbedArea label={__('Embedded')} claim={claim} noSnackbar />}
{!webShareable && <p className={'help'}>{__('Paid content cannot be embedded')}</p>}
<div className="card__actions"> <div className="card__actions">
<Button button="link" label={__('Done')} onClick={onDone} /> <Button button="link" label={__('Done')} onClick={onDone} />
</div> </div>

3
webpack.electron.config.js
View file

@ -106,9 +106,6 @@ const renderConfig = {
}, },
], ],
}, },
resolve: {
modules: ['node_modules'],
},
plugins: [ plugins: [
// new BundleAnalyzerPlugin(), // new BundleAnalyzerPlugin(),
new DefinePlugin({ new DefinePlugin({

4
yarn.lock
View file

@ -7032,9 +7032,9 @@ lazy-val@^1.0.4:
yargs "^13.2.2" yargs "^13.2.2"
zstd-codec "^0.1.1" zstd-codec "^0.1.1"
lbry-redux@lbryio/lbry-redux#4491b975cc3e23bf3733272b7c6079a28c1036b3: lbry-redux@lbryio/lbry-redux#fcc9746ff7c81e6fe05f74dd99511775edc5ad9c:
version "0.0.1" version "0.0.1"
resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/4491b975cc3e23bf3733272b7c6079a28c1036b3" resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/fcc9746ff7c81e6fe05f74dd99511775edc5ad9c"
dependencies: dependencies:
proxy-polyfill "0.1.6" proxy-polyfill "0.1.6"
reselect "^3.0.0" reselect "^3.0.0"