Merge branch 'master' into i18n
This commit is contained in:
commit
0153a6dab5
12 changed files with 46 additions and 35 deletions
|
@ -1,5 +1,5 @@
|
|||
[bumpversion]
|
||||
current_version = 0.11.7
|
||||
current_version = 0.11.9
|
||||
commit = True
|
||||
tag = True
|
||||
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<candidate>\d+))?
|
||||
|
|
16
CHANGELOG.md
16
CHANGELOG.md
|
@ -27,6 +27,22 @@ Web UI version numbers should always match the corresponding version of LBRY App
|
|||
*
|
||||
*
|
||||
|
||||
## [0.11.9] - 2017-06-01
|
||||
|
||||
### Fixed
|
||||
* Windows upgrade process fixed
|
||||
* Upgrade process on Mac and Linux will open the file rather than the folder
|
||||
|
||||
|
||||
|
||||
## [0.11.8] - 2017-05-31
|
||||
|
||||
### Fixed
|
||||
* Verified access from two different installation ids
|
||||
* Version upgrade check on help page
|
||||
|
||||
|
||||
|
||||
## [0.11.7] - 2017-05-30
|
||||
|
||||
### Changed
|
||||
|
|
|
@ -116,7 +116,7 @@ function openItem(fullPath) {
|
|||
} else if (process.platform == 'linux') {
|
||||
child = child_process.spawn('xdg-open', [fullPath], subprocOptions);
|
||||
} else if (process.platform == 'win32') {
|
||||
child = child_process.spawn(fullPath, [], subprocOptions);
|
||||
child = child_process.spawn(fullPath, Object.assign({}, subprocOptions, {shell: true}));
|
||||
}
|
||||
|
||||
// Causes child process reference to be garbage collected, allowing main process to exit
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "LBRY",
|
||||
"version": "0.11.7",
|
||||
"version": "0.11.9",
|
||||
"main": "main.js",
|
||||
"description": "LBRY is a fully decentralized, open-source protocol facilitating the discovery, access, and (sometimes) purchase of data.",
|
||||
"author": {
|
||||
|
|
|
@ -2,7 +2,7 @@ import * as types from 'constants/action_types'
|
|||
import lbry from 'lbry'
|
||||
import {
|
||||
selectUpdateUrl,
|
||||
selectUpgradeDownloadDir,
|
||||
selectUpgradeDownloadPath,
|
||||
selectUpgradeDownloadItem,
|
||||
selectUpgradeFilename,
|
||||
selectPageTitle,
|
||||
|
@ -110,7 +110,7 @@ export function doSkipUpgrade() {
|
|||
export function doStartUpgrade() {
|
||||
return function(dispatch, getState) {
|
||||
const state = getState()
|
||||
const upgradeDownloadPath = selectUpgradeDownloadDir(state)
|
||||
const upgradeDownloadPath = selectUpgradeDownloadPath(state)
|
||||
|
||||
ipcRenderer.send('upgrade', upgradeDownloadPath)
|
||||
}
|
||||
|
@ -135,14 +135,11 @@ export function doDownloadUpgrade() {
|
|||
* too soon.
|
||||
*/
|
||||
|
||||
const _upgradeDownloadItem = downloadItem;
|
||||
const _upgradeDownloadPath = path.join(dir, upgradeFilename);
|
||||
|
||||
dispatch({
|
||||
type: types.UPGRADE_DOWNLOAD_COMPLETED,
|
||||
data: {
|
||||
dir,
|
||||
downloadItem
|
||||
downloadItem,
|
||||
path: path.join(dir, upgradeFilename)
|
||||
}
|
||||
})
|
||||
});
|
||||
|
|
|
@ -41,7 +41,7 @@ class SubmitEmailStage extends React.Component {
|
|||
lbryio.call('user_email', 'new', {email: this.state.email}, 'post').then(() => {
|
||||
this.onEmailSaved(this.state.email);
|
||||
}, (error) => {
|
||||
if (error.xhr && error.xhr.status == 409) {
|
||||
if (error.xhr && (error.xhr.status == 409 || error.message == "This email is already in use")) {
|
||||
this.onEmailSaved(this.state.email);
|
||||
return;
|
||||
} else if (this._emailRow) {
|
||||
|
|
|
@ -101,7 +101,6 @@ lbry.connect = function() {
|
|||
let tryNum = 0
|
||||
|
||||
function checkDaemonStartedFailed() {
|
||||
console.log('status error try num ' + tryNum)
|
||||
if (tryNum <= 100) { // Move # of tries into constant or config option
|
||||
setTimeout(() => {
|
||||
tryNum++
|
||||
|
@ -115,7 +114,6 @@ lbry.connect = function() {
|
|||
|
||||
// Check every half second to see if the daemon is accepting connections
|
||||
function checkDaemonStarted() {
|
||||
console.log('check daemon started try ' + tryNum)
|
||||
lbry.call('status', {}, resolve, checkDaemonStartedFailed, checkDaemonStartedFailed)
|
||||
}
|
||||
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
import {getLocal, getSession, setSession, setLocal} from './utils.js';
|
||||
import {getSession, setSession} from './utils.js';
|
||||
import lbry from './lbry.js';
|
||||
|
||||
const querystring = require('querystring');
|
||||
|
||||
const lbryio = {
|
||||
_accessToken: getLocal('accessToken'),
|
||||
_accessToken: getSession('accessToken'),
|
||||
_authenticationPromise: null,
|
||||
_user : null,
|
||||
enabled: true
|
||||
|
@ -95,11 +95,11 @@ lbryio.call = function(resource, action, params={}, method='get', evenIfDisabled
|
|||
};
|
||||
|
||||
lbryio.getAccessToken = () => {
|
||||
return getLocal('accessToken');
|
||||
return getSession('accessToken');
|
||||
}
|
||||
|
||||
lbryio.setAccessToken = (token) => {
|
||||
setLocal('accessToken', token)
|
||||
setSession('accessToken', token)
|
||||
}
|
||||
|
||||
lbryio.authenticate = function() {
|
||||
|
|
|
@ -4,7 +4,6 @@ import lbry from 'lbry.js';
|
|||
import Link from 'component/link';
|
||||
import SubHeader from 'component/subHeader'
|
||||
import {BusyMessage} from 'component/common'
|
||||
import {version as uiVersion} from 'json!../../../package.json';
|
||||
|
||||
class HelpPage extends React.Component {
|
||||
constructor(props) {
|
||||
|
@ -13,13 +12,16 @@ class HelpPage extends React.Component {
|
|||
this.state = {
|
||||
versionInfo: null,
|
||||
lbryId: null,
|
||||
uiVersion: null,
|
||||
upgradeAvailable: null
|
||||
};
|
||||
}
|
||||
|
||||
componentWillMount() {
|
||||
lbry.getAppVersionInfo().then((info) => {
|
||||
lbry.getAppVersionInfo().then(({remoteVersion, upgradeAvailable}) => {
|
||||
this.setState({
|
||||
appVersionInfo: info,
|
||||
uiVersion: remoteVersion,
|
||||
upgradeAvailable: upgradeAvailable
|
||||
});
|
||||
});
|
||||
lbry.call('version', {}, (info) => {
|
||||
|
@ -43,7 +45,6 @@ class HelpPage extends React.Component {
|
|||
|
||||
if (this.state.versionInfo) {
|
||||
ver = this.state.versionInfo;
|
||||
console.log(ver)
|
||||
if (ver.os_system == 'Darwin') {
|
||||
osName = (parseInt(ver.os_release.match(/^\d+/)) < 16 ? 'Mac OS X' : 'Mac OS');
|
||||
|
||||
|
@ -93,15 +94,14 @@ class HelpPage extends React.Component {
|
|||
<div className="meta">{__("Thanks! LBRY is made by its users.")}</div>
|
||||
</div>
|
||||
</section>
|
||||
{!ver ? null :
|
||||
<section className="card">
|
||||
<section className="card">
|
||||
<div className="card__title-primary"><h3>{__("About")}</h3></div>
|
||||
<div className="card__content">
|
||||
{this.state.appVersionInfo ?
|
||||
(ver.lbrynet_update_available || ver.lbryum_update_available ?
|
||||
<p>{__("A newer version of LBRY is available.")} <Link href={newVerLink} label={__("Download LBRY %s now!", ver.remote_lbrynet)} /></p>
|
||||
: <p>{__("Your copy of LBRY is up to date.")}</p>) : null}
|
||||
{ ver ?
|
||||
{ this.state.upgradeAvailable === null ? '' :
|
||||
( this.state.upgradeAvailable ?
|
||||
<p>A newer version of LBRY is available. <Link href={newVerLink} label={`Download now!`} /></p>
|
||||
: <p>Your copy of LBRY is up to date.</p>)}
|
||||
{ this.state.uiVersion && ver ?
|
||||
<table className="table-standard">
|
||||
<tbody>
|
||||
<tr>
|
||||
|
@ -114,7 +114,7 @@ class HelpPage extends React.Component {
|
|||
</tr>
|
||||
<tr>
|
||||
<th>{__("interface")}</th>
|
||||
<td>{uiVersion}</td>
|
||||
<td>{this.state.uiVersion}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>{__("Platform")}</th>
|
||||
|
|
|
@ -34,7 +34,7 @@ reducers[types.UPGRADE_CANCELLED] = function(state, action) {
|
|||
|
||||
reducers[types.UPGRADE_DOWNLOAD_COMPLETED] = function(state, action) {
|
||||
return Object.assign({}, state, {
|
||||
downloadDir: action.data.dir,
|
||||
downloadPath: action.data.path,
|
||||
upgradeDownloading: false,
|
||||
upgradeDownloadCompleted: true
|
||||
})
|
||||
|
|
|
@ -100,11 +100,11 @@ export const selectUpgradeFilename = createSelector(
|
|||
(platform, version) => {
|
||||
switch (platform) {
|
||||
case 'darwin':
|
||||
return `LBRY-${version}.dmg`;
|
||||
return `LBRY_${version}.dmg`;
|
||||
case 'linux':
|
||||
return `LBRY_${version}_amd64.deb`;
|
||||
case 'win32':
|
||||
return `LBRY.Setup.${version}.exe`;
|
||||
return `LBRY_${version}.exe`;
|
||||
default:
|
||||
throw 'Unknown platform';
|
||||
}
|
||||
|
@ -163,9 +163,9 @@ export const selectUpgradeSkipped = createSelector(
|
|||
(state) => state.upgradeSkipped
|
||||
)
|
||||
|
||||
export const selectUpgradeDownloadDir = createSelector(
|
||||
export const selectUpgradeDownloadPath = createSelector(
|
||||
_selectState,
|
||||
(state) => state.downloadDir
|
||||
(state) => state.downloadPath
|
||||
)
|
||||
|
||||
export const selectUpgradeDownloadItem = createSelector(
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "lbry-web-ui",
|
||||
"version": "0.11.7",
|
||||
"version": "0.11.9",
|
||||
"description": "LBRY UI",
|
||||
"scripts": {
|
||||
"test": "echo \"Error: no test specified\" && exit 1",
|
||||
|
|
Loading…
Reference in a new issue