Merge branch 'redux' of https://github.com/lbryio/lbry-app into redux

This commit is contained in:
6ea86b96 2017-05-05 11:15:20 +07:00
commit ca2c678301
6 changed files with 9 additions and 9 deletions

View file

@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.10.0rc8
current_version = 0.10.0rc9
commit = True
tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<candidate>\d+))?

View file

@ -1,6 +1,6 @@
{
"name": "LBRY",
"version": "0.10.0rc8",
"version": "0.10.0rc9",
"main": "main.js",
"description": "LBRY is a fully decentralized, open-source protocol facilitating the discovery, access, and (sometimes) purchase of data.",
"author": {

View file

@ -1 +1 @@
https://github.com/lbryio/lbry/releases/download/v0.10.1rc2/lbrynet-daemon-v0.10.1rc2-OSNAME.zip
https://github.com/lbryio/lbry/releases/download/v0.10.3rc1/lbrynet-daemon-v0.10.3rc1-OSNAME.zip

View file

@ -95,7 +95,7 @@ let lbry = {
};
lbry.call = function (method, params, callback, errorCallback, connectFailedCallback) {
jsonrpc.call(lbry.daemonConnectionString, method, [params], callback, errorCallback, connectFailedCallback);
jsonrpc.call(lbry.daemonConnectionString, method, params, callback, errorCallback, connectFailedCallback);
}
//core
@ -673,7 +673,7 @@ lbry.settings_get = function(params={}) {
// lbry.get = function(params={}) {
// return function(params={}) {
// return new Promise((resolve, reject) => {
// jsonrpc.call(lbry.daemonConnectionString, "get", [params], resolve, reject, reject);
// jsonrpc.call(lbry.daemonConnectionString, "get", params, resolve, reject, reject);
// });
// };
// }
@ -686,7 +686,7 @@ lbry = new Proxy(lbry, {
return function(params={}) {
return new Promise((resolve, reject) => {
jsonrpc.call(lbry.daemonConnectionString, name, [params], resolve, reject, reject);
jsonrpc.call(lbry.daemonConnectionString, name, params, resolve, reject, reject);
});
};
}

View file

@ -23,7 +23,7 @@ var SettingsPage = React.createClass({
this.setDaemonSetting('run_on_startup', event.target.checked);
},
onShareDataChange: function (event) {
this.setDaemonSetting('share_usage_stats', event.target.checked);
this.setDaemonSetting('share_usage_data', event.target.checked);
},
onDownloadDirChange: function(event) {
this.setDaemonSetting('download_directory', event.target.value);
@ -188,7 +188,7 @@ var SettingsPage = React.createClass({
<div className="card__content">
<FormRow type="checkbox"
onChange={this.onShareDataChange}
defaultChecked={this.state.daemonSettings.share_usage_stats}
defaultChecked={this.state.daemonSettings.share_usage_data}
label="Help make LBRY better by contributing diagnostic data about my usage" />
</div>
</section>

View file

@ -1,6 +1,6 @@
{
"name": "lbry-web-ui",
"version": "0.10.0rc8",
"version": "0.10.0rc9",
"description": "LBRY UI",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",