From d58ba1411ea62fff8152fd507b3edfb8319a07a6 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Fri, 30 Aug 2019 21:37:11 -0500 Subject: [PATCH] #8: Add tooltips to settings --- package.json | 2 +- src/assets/settings.json | 10 +++++++--- src/constants.js | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index eff71cd..373cb7e 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "test": "react-scripts test", "eject": "react-scripts eject", "electron-dev": "cross-env ELECTRON_START_URL=http://localhost:3000 electron .", - "electron-dev-unix": "cross-env ELECTRON_START_URL=http://localhost:3000 electron $NODE_DEBUG_OPTION .", + "electron-dev-unix": "cross-env ELECTRON_START_URL=http://localhost:3000 electron .", "pack": "npm run build && electron-builder --dir --x64", "dist": "npm run build && electron-builder --x64", "dist-all": "npm run build && electron-builder --x64 --win --linux --mac", diff --git a/src/assets/settings.json b/src/assets/settings.json index 893ff9c..2642db6 100644 --- a/src/assets/settings.json +++ b/src/assets/settings.json @@ -1,11 +1,15 @@ { "HostConfig": { - + "AgentString": "'User-Agent' used when communicating with Sia/SiaPrime's API.", + "ApiPassword": "Password used when communicating with Sia/SiaPrime's API.\n\nThis is not the same as your wallet's password, so please do not enter it here. Sia/SiaPrime typically auto-generate this value. It is exclusively used for API authentication purposes.", + "ApiPort": "API port used to connect to Sia/SiaPrime's daemon.", + "HostNameOrIp": "IP address or host name of Sia/SiaPrime daemon.", + "TimeoutMs": "Number of milliseconds to wait for Sia/SiaPrime API responses before timing out." }, "Settings": { - "ApiAuth": "Password used to connect to Repertory API. Auto-generated by default.", + "ApiAuth": "Password used to communicate with Repertory's API. Auto-generated by default.", "ApiPort": "Repertory API port to use for JSON-RPC requests.", - "ApiUser": "Username used to connect to Repertory API.", + "ApiUser": "Username used to communicate with Repertory's API.", "ChunkDownloaderTimeoutSeconds": "Files that are not cached locally will download data in ChunkSize chunks when a read or write operation occurs. This timeout value specifies the amount of time chunks should continue downloading after the last file handle has been closed.", "ChunkSize": "This is the minimum data size (converted to KiB - value of 8 means 8KiB) used for downloads. This value cannot be less than 8 and should also be a multiple of 8.", "EnableChunkDownloaderTimeout": "This setting applies to full allocation downloads. When set to true, downloads will timeout after ChunkDownloaderTimeoutSeconds if the file has no more open handles. If set to false, the entire file will always download.", diff --git a/src/constants.js b/src/constants.js index a74beef..7582f13 100644 --- a/src/constants.js +++ b/src/constants.js @@ -28,8 +28,8 @@ exports.DEV_PUBLIC_KEY = '-----BEGIN PUBLIC KEY-----\n' + '-----END PUBLIC KEY-----'; -const REPERTORY_BRANCH = '1.1.0-release_branch'; -const REPERTORY_UI_BRANCH = '1.0.8_branch'; +const REPERTORY_BRANCH = 'master'; +const REPERTORY_UI_BRANCH = 'master'; exports.RELEASES_URL = 'https://bitbucket.org/blockstorage/repertory/raw/' + REPERTORY_BRANCH + '/releases.json'; exports.UI_RELEASES_URL = 'https://bitbucket.org/blockstorage/repertory-ui/raw/' + REPERTORY_UI_BRANCH + '/releases.json';