diff --git a/.tx/config b/.tx/config index d4677541c..3868bf506 100644 --- a/.tx/config +++ b/.tx/config @@ -1,7 +1,7 @@ [main] host = https://www.transifex.com -[lbry-app.app-strings] +[lbry-deskop.app-strings] file_filter = dist/locales/.json source_file = dist/locales/en.json source_lang = en diff --git a/CHANGELOG.md b/CHANGELOG.md index 26713a24b..cba6ffa40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,10 +7,20 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). ### Fixed + * Edit option missing from certain published claims ([#175](https://github.com/lbryio/lbry-desktop/issues/1756)) + ### Added + * Added 3D file viewer for OBJ & STL file types ([#1558](https://github.com/lbryio/lbry-desktop/pull/1558)) + * Added thumbnail preview on publish page ([#1755](https://github.com/lbryio/lbry-desktop/pull/1755)) + ### Changed + * Rename the Github repo to lbry-desktop ([#1765](https://github.com/lbryio/lbry-desktop/pull/1765)) + * Only show video error modal if you are on the video page & don't retry to play failed videos ([#1768](https://github.com/lbryio/lbry-desktop/pull/1768)) + * Actually hide NSFW files if a user chooses to hide NSFW content via the settings page ([#1748](https://github.com/lbryio/lbry-desktop/pull/1748)) + * Hide the "Community top bids" section if user chooses to hide NSFW content ([#1760](https://github.com/lbryio/lbry-desktop/pull/1760)) + * Add a more descriptive error message when Shapeshift is unavailable ([#1771](https://github.com/lbryio/lbry-desktop/pull/1771)) ## [0.22.2] - 2018-07-09 @@ -33,7 +43,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). * Console errors when multiple downloads for same claim exist ([#1724](https://github.com/lbryio/lbry-desktop/pull/1724)) * App version in dev mode ([#1722](https://github.com/lbryio/lbry-desktop/pull/1722)) * Long URI name displays in transaction list/Help ([#1694](https://github.com/lbryio/lbry-desktop/pull/1694))/([#1692](https://github.com/lbryio/lbry-desktop/pull/1692)) - * Edit option missing from certain published claims ([#175](https://github.com/lbryio/lbry-desktop/issues/1756)) + ### Changed * Show claim name, instead of URI, when loading a channel([#1711](https://github.com/lbryio/lbry-desktop/pull/1711)) diff --git a/README.md b/README.md index 8c0c5e55d..04616e269 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ [![Codacy Badge](https://api.codacy.com/project/badge/Grade/78b627d4f5524792adc48719835e1523)](https://www.codacy.com/app/LBRY/lbry-desktop?utm_source=github.com&utm_medium=referral&utm_content=lbryio/lbry-desktop&utm_campaign=Badge_Grade) [![chat on Discord](https://img.shields.io/discord/362322208485277697.svg?logo=discord)](https://chat.lbry.io) +[![forthebadge](https://forthebadge.com/images/badges/certified-steve-bruhle.svg)](https://forthebadge.com) + The LBRY app is a graphical browser for the decentralized content marketplace provided by the [LBRY](https://lbry.io) protocol. It is essentially the [lbry daemon](https://github.com/lbryio/lbry) bundled with an UI using diff --git a/package.json b/package.json index d48b6ae94..786ebab43 100644 --- a/package.json +++ b/package.json @@ -42,13 +42,13 @@ "electron-is-dev": "^0.3.0", "electron-log": "^2.2.12", "electron-publisher-s3": "^20.8.1", - "electron-updater": "^2.21.10", + "electron-updater": "^2.23.3", "electron-window-state": "^4.1.1", "find-process": "^1.1.0", "formik": "^0.10.4", "hast-util-sanitize": "^1.1.2", "keytar": "^4.2.1", - "lbry-redux": "lbryio/lbry-redux#177ef2c1916f9672e713267500e447d671ae1bc3", + "lbry-redux": "lbryio/lbry-redux#e0909b08647a790d155f3189b9f9bf0b3e55bd17", "localforage": "^1.7.1", "mime": "^2.3.1", "mixpanel-browser": "^2.17.1", @@ -78,6 +78,7 @@ "shapeshift.io": "^1.3.1", "source-map-support": "^0.5.4", "stream-to-blob-url": "^2.1.1", + "three": "^0.93.0", "tree-kill": "^1.1.0", "y18n": "^4.0.0" }, @@ -93,7 +94,7 @@ "del": "^3.0.0", "devtron": "^1.4.0", "electron": "^1.8.4", - "electron-builder": "^20.13.3", + "electron-builder": "^20.22.0", "electron-devtools-installer": "^2.2.3", "electron-webpack": "^1.13.0", "eslint": "^4.19.0", @@ -126,7 +127,7 @@ "yarn": "^1.3" }, "lbrySettings": { - "lbrynetDaemonVersion": "0.20.3", + "lbrynetDaemonVersion": "0.20.4", "lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-daemon-vDAEMONVER-OSNAME.zip", "lbrynetDaemonDir": "static/daemon", "lbrynetDaemonFileName": "lbrynet-daemon" diff --git a/src/main/index.js b/src/main/index.js index 807ca08e4..1c81d6217 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -53,6 +53,13 @@ app.setAsDefaultProtocolClient('lbry'); app.setName('LBRY'); app.setAppUserModelId('io.lbry.LBRY'); +if (isDev) { + // Enable WEBGL + app.commandLine.appendSwitch('ignore-gpu-blacklist'); + app.commandLine.appendSwitch('--disable-gpu-process-crash-limit'); + app.disableDomainBlockingFor3DAPIs(); +} + app.on('ready', async () => { const processList = await findProcess('name', 'lbrynet-daemon'); const isDaemonRunning = processList.length > 0; diff --git a/src/renderer/component/common/file-selector.jsx b/src/renderer/component/common/file-selector.jsx index ec19394e1..3729202d0 100644 --- a/src/renderer/component/common/file-selector.jsx +++ b/src/renderer/component/common/file-selector.jsx @@ -9,7 +9,7 @@ type Props = { type: string, currentPath: ?string, onFileChosen: (string, string) => void, - fileLabel: ?string, + fileLabel?: string, directoryLabel?: string, }; @@ -56,7 +56,7 @@ class FileSelector extends React.PureComponent { type === 'file' ? fileLabel || __('Choose File') : directoryLabel || __('Choose Directory'); return ( - +