diff --git a/CHANGELOG.md b/CHANGELOG.md index 4eceac2e65..109161f27e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -67,7 +67,7 @@ New features Bug fixes -------- -- Add Bitshares bloom filter for BTS 1 account imports +- Add BitShares bloom filter for BTS 1 account imports - Fix a GenesisFilter bug and update ImportKeys flow slightly - Fix input of uppercase characters in AccountPermissions - Fix Highcharts build issues diff --git a/README.md b/README.md index 2927121857..91447f7d0b 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ -Bitshares-UI +BitShares-UI ============ [![Slack](http://slack.bitshares.org/badge.svg)](http://slack.bitshares.org/) -This is a light wallet that connects to a Bitshares API provided by the *witness_node* executable. +This is a light wallet that connects to a BitShares API provided by the *witness_node* executable. It *stores all keys locally* in the browser, *never exposing your keys to anyone* as it signs transactions locally before transmitting them to the API server which then broadcasts them to the blockchain network. The wallet is encrypted with a password of your choosing and encrypted in a browser database. ### Getting started -Bitshares-UI depends node Node.js, and version 6+ is required. It has not yet been tested with v7. +BitShares-UI depends node Node.js, and version 6+ is required. It has not yet been tested with v7. On Ubuntu and OSX, the easiest way to install Node is to use the [Node Version Manager](https://github.com/creationix/nvm). @@ -44,7 +44,7 @@ npm start Once the compilation is done the GUI will be available in your browser at: `localhost:8080` or `127.0.0.1:8080`. Hot Reloading is enabled so the browser will live update as you edit the source files. ### Testnet -By default bitshares-ui connects to the live Bitshares network, but it's very easy to switch it to the testnet run by Xeroc. To do so, open the UI in a browser, go to Settings, then under Access, select the *Public Testnet Server* in the dropdown menu. You should also change the faucet if you need to create an account, the testnet faucet address is https://testnet.bitshares.eu. +By default bitshares-ui connects to the live BitShares network, but it's very easy to switch it to the testnet run by Xeroc. To do so, open the UI in a browser, go to Settings, then under Access, select the *Public Testnet Server* in the dropdown menu. You should also change the faucet if you need to create an account, the testnet faucet address is https://testnet.bitshares.eu. The UI will reload and connect to the testnet, where you can use the faucet to create an account and receive an initial sum of test BTS. @@ -61,7 +61,7 @@ This will create a bundle in the /dist folder that can be hosted with the web se We use Electron to provide installable wallets, available for Windows, OSX and Linux Debian platforms such as Ubuntu. First, install the required packages in the `electron` folder. Then go to the `web` folder and run `npm run electron`. This will compile the UI with some special modifications for use with Electron, and copy the result to the root `electron/build` folder. Now go back to the `electron` folder and run `npm run release` in order to build a wallet for your platform. ## Contributing -Bitshares-UI is open source and anyone is free to contribute. PR's are welcomed and will be reviewed in a timely manner, and long-term contributors will be given access to the repo. +BitShares-UI is open source and anyone is free to contribute. PR's are welcomed and will be reviewed in a timely manner, and long-term contributors will be given access to the repo. If you would like to get involved, we have a Slack channel where you can ask questions and get help. diff --git a/docs/_build/html/_sources/index.txt b/docs/_build/html/_sources/index.txt index 4f40b0a8f8..1a124f6c98 100644 --- a/docs/_build/html/_sources/index.txt +++ b/docs/_build/html/_sources/index.txt @@ -1,7 +1,7 @@ Graphene UI documentation ======================================== -Graphene UI is the open-source front-end for `Cryptonomex Graphene `_. A live hosted wallet running a custom themed version of Graphene UI for Bitshares can be found at ``_ +Graphene UI is the open-source front-end for `Cryptonomex Graphene `_. A live hosted wallet running a custom themed version of Graphene UI for BitShares can be found at ``_ Contents: diff --git a/docs/_build/html/index.html b/docs/_build/html/index.html index 6ecf478db1..5ad74be8e3 100644 --- a/docs/_build/html/index.html +++ b/docs/_build/html/index.html @@ -141,7 +141,7 @@

Graphene UI documentation

-

Graphene UI is the open-source front-end for Cryptonomex Graphene. A live hosted wallet running a custom themed version of Graphene UI for Bitshares can be found at https://bitshares.openledger.info

+

Graphene UI is the open-source front-end for Cryptonomex Graphene. A live hosted wallet running a custom themed version of Graphene UI for BitShares can be found at https://bitshares.openledger.info

Contents:

The basics

diff --git a/docs/index.rst b/docs/index.rst index 4f40b0a8f8..1a124f6c98 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,7 +1,7 @@ Graphene UI documentation ======================================== -Graphene UI is the open-source front-end for `Cryptonomex Graphene `_. A live hosted wallet running a custom themed version of Graphene UI for Bitshares can be found at ``_ +Graphene UI is the open-source front-end for `Cryptonomex Graphene `_. A live hosted wallet running a custom themed version of Graphene UI for BitShares can be found at ``_ Contents: diff --git a/help/cn/components/AccountVotingProxy.md b/help/cn/components/AccountVotingProxy.md index 1d03c61368..811465925d 100644 --- a/help/cn/components/AccountVotingProxy.md +++ b/help/cn/components/AccountVotingProxy.md @@ -1 +1 @@ -代理投票账户代表你行使投票权力。你可以在[Bitsharestalk](https://bitsharestalk.org/index.php/board,104.0.html)论坛上找到一些申请成为投票代理人的提案。 \ No newline at end of file +代理投票账户代表你行使投票权力。你可以在[BitSharestalk](https://bitsharestalk.org/index.php/board,104.0.html)论坛上找到一些申请成为投票代理人的提案。 \ No newline at end of file diff --git a/help/cn/components/AccountVotingWitnesses.md b/help/cn/components/AccountVotingWitnesses.md index 1a68f0c63b..5b280a6de1 100644 --- a/help/cn/components/AccountVotingWitnesses.md +++ b/help/cn/components/AccountVotingWitnesses.md @@ -1 +1 @@ -[见证人](introduction/witness) 是BitShares系统中区块的生产者。他们验证交易数据并维护网络安全。你可以投票选举你信任的人成为见证人。投票时，你选择的候选人将获得你投出的相同票数。见证人的竞选帖可在这里找到[Bitsharestalk](https://bitsharestalk.org/index.php/board,61.0.html)。 \ No newline at end of file +[见证人](introduction/witness) 是BitShares系统中区块的生产者。他们验证交易数据并维护网络安全。你可以投票选举你信任的人成为见证人。投票时，你选择的候选人将获得你投出的相同票数。见证人的竞选帖可在这里找到[BitSharestalk](https://bitsharestalk.org/index.php/board,61.0.html)。 \ No newline at end of file diff --git a/help/cn/components/AccountVotingWorkers.md b/help/cn/components/AccountVotingWorkers.md index 3517f1225f..3dd023cc7f 100644 --- a/help/cn/components/AccountVotingWorkers.md +++ b/help/cn/components/AccountVotingWorkers.md @@ -1 +1 @@ -[预算项目](introduction/workers) 是BitShares系统中独有的概念。他们是一些期望通过提供服务来从区块链获得奖金的工作项目提案。一项提案包含一个指向网站或论坛帖子的链接，在其中详细解释了工作项目的介绍。在这里[Bitsharestalk](https://bitsharestalk.org/index.php/board,103.0.html)可以看到一些提案。 \ No newline at end of file +[预算项目](introduction/workers) 是BitShares系统中独有的概念。他们是一些期望通过提供服务来从区块链获得奖金的工作项目提案。一项提案包含一个指向网站或论坛帖子的链接，在其中详细解释了工作项目的介绍。在这里[BitSharestalk](https://bitsharestalk.org/index.php/board,103.0.html)可以看到一些提案。 \ No newline at end of file diff --git a/help/en/components/AccountVoting.md b/help/en/components/AccountVoting.md index 87681575d1..bf817a7236 100644 --- a/help/en/components/AccountVoting.md +++ b/help/en/components/AccountVoting.md @@ -1,5 +1,5 @@ ### Voting -Voting in Bitshares is important for both the security and the development of the network. If you prefer, you may delegate your voting power to a Proxy, who can then vote on your behalf. If you do choose to use a Proxy, manual voting will be disabled. +Voting in BitShares is important for both the security and the development of the network. If you prefer, you may delegate your voting power to a Proxy, who can then vote on your behalf. If you do choose to use a Proxy, manual voting will be disabled. Voting changes will only be applied once you click on 'Publish changes' and broadcast your changes to the network. diff --git a/help/en/components/AccountVotingCommittee.md b/help/en/components/AccountVotingCommittee.md index 7529d86d33..22a6638e5d 100644 --- a/help/en/components/AccountVotingCommittee.md +++ b/help/en/components/AccountVotingCommittee.md @@ -1 +1 @@ -[Committee members](introduction/committee) may propose changes to the dynamic parameters of the blockchain, such as fees, block time and many other things. It is a position of great responsibility that requires a good understanding of how Bitshares works. \ No newline at end of file +[Committee members](introduction/committee) may propose changes to the dynamic parameters of the blockchain, such as fees, block time and many other things. It is a position of great responsibility that requires a good understanding of how BitShares works. \ No newline at end of file diff --git a/help/en/components/AccountVotingProxy.md b/help/en/components/AccountVotingProxy.md index 9d739ce76d..c3c32981d5 100644 --- a/help/en/components/AccountVotingProxy.md +++ b/help/en/components/AccountVotingProxy.md @@ -1 +1 @@ -A proxy handles voting on your behalf. You may find people proposing to act as proxies in the Bitshares forum [Bitsharestalk](https://bitsharestalk.org/index.php/board,104.0.html). +A proxy handles voting on your behalf. You may find people proposing to act as proxies in the BitShares forum [BitSharestalk](https://bitsharestalk.org/index.php/board,104.0.html). diff --git a/help/en/components/AccountVotingWitnesses.md b/help/en/components/AccountVotingWitnesses.md index 489a0c168b..78acaf4452 100644 --- a/help/en/components/AccountVotingWitnesses.md +++ b/help/en/components/AccountVotingWitnesses.md @@ -1 +1 @@ -[Witnesses](introduction/witness) are the block producers of Bitshares. They validate transactions and ensure the safety of the network. You may vote for as many witnesses as you'd like, and they will all receive the same amount of votes. Witness proposals can be found here: [Bitsharestalk](https://bitsharestalk.org/index.php/board,61.0.html). \ No newline at end of file +[Witnesses](introduction/witness) are the block producers of BitShares. They validate transactions and ensure the safety of the network. You may vote for as many witnesses as you'd like, and they will all receive the same amount of votes. Witness proposals can be found here: [BitSharestalk](https://bitsharestalk.org/index.php/board,61.0.html). \ No newline at end of file diff --git a/help/en/components/AccountVotingWorkers.md b/help/en/components/AccountVotingWorkers.md index eb1316513d..551da2ad2d 100644 --- a/help/en/components/AccountVotingWorkers.md +++ b/help/en/components/AccountVotingWorkers.md @@ -1 +1 @@ -[Workers](introduction/workers) are a unique concept to Bitshares. They are proposals to provide services in return for a salary from the blockchain itself. A proposal should include a link to a website or forum thread that explains the purpose of the proposal, a collection of proposals can be found here: [Bitsharestalk](https://bitsharestalk.org/index.php/board,103.0.html). \ No newline at end of file +[Workers](introduction/workers) are a unique concept to BitShares. They are proposals to provide services in return for a salary from the blockchain itself. A proposal should include a link to a website or forum thread that explains the purpose of the proposal, a collection of proposals can be found here: [BitSharestalk](https://bitsharestalk.org/index.php/board,103.0.html). \ No newline at end of file diff --git a/help/en/introduction/bridges_gateways.md b/help/en/introduction/bridges_gateways.md index b687e13ca0..ff1f372505 100644 --- a/help/en/introduction/bridges_gateways.md +++ b/help/en/introduction/bridges_gateways.md @@ -3,7 +3,7 @@ Both bridges and gateways allow you to deposit and withdraw coins, but there is a difference in the amount of trust you need to place in the service providers. ### Bridges: trust-free model -A bridge service provides a way to deposit an amount of a crypto-currency other than Bitshares, and in turn receive a SmartCoin equivalent. SmartCoins have no counterparty risk, so the only risk you experience when using a bridge is during the short time it takes to complete the transfer. This is better than a centralized exchange such as Poloniex, where you are always at risk of the exchange being hacked, going bankrupt, or experiencing any number of other issues. +A bridge service provides a way to deposit an amount of a crypto-currency other than BitShares, and in turn receive a SmartCoin equivalent. SmartCoins have no counterparty risk, so the only risk you experience when using a bridge is during the short time it takes to complete the transfer. This is better than a centralized exchange such as Poloniex, where you are always at risk of the exchange being hacked, going bankrupt, or experiencing any number of other issues. ### Gateways: trust-based model Gateways are basically equivalent to the standard exchange model where you depend on the solvency of the exchange to be able to redeem your coins. Generally gateways issue assets prefixed with their symbol, like OPEN, TRADE, or META. These assets are backed 100% by the real BTC or ETH or any other coin that people deposit with the gateways. diff --git a/help/tr/accounts/permissions.md b/help/tr/accounts/permissions.md index fd98826474..a49d5f0274 100644 --- a/help/tr/accounts/permissions.md +++ b/help/tr/accounts/permissions.md @@ -30,7 +30,7 @@ işe yarar. ## (Düz) Çok-İmzalı Düz çok-imzalı bir şema, işlemin geçerli olabilmesi için aralarından 'N' sayıda kişinin -imzası gerekli toplam 'M' sayıda kişiden oluşur. Şimdi biz, Bitshares'de, 'M' +imzası gerekli toplam 'M' sayıda kişiden oluşur. Şimdi biz, BitShares'de, 'M' ve 'N' yerine *ağırlıklar* ve *alt-sınır* kullanıyoruz. Şimdi göreceğimiz gibi tamamen aynı sonuca çok daha esnek bir şekilde varacağız. diff --git a/help/tr/components/AccountVotingProxy.md b/help/tr/components/AccountVotingProxy.md index 922ff57e7b..ee67638cfa 100644 --- a/help/tr/components/AccountVotingProxy.md +++ b/help/tr/components/AccountVotingProxy.md @@ -1 +1 @@ -Bir vekil adınıza oy kullanımını yönetir. BitShares forumunda vekil olarak görev almaya gnüllü kişileri bulabilirsiniz [Bitsharestalk](https://bitsharestalk.org/index.php/board,104.0.html). \ No newline at end of file +Bir vekil adınıza oy kullanımını yönetir. BitShares forumunda vekil olarak görev almaya gnüllü kişileri bulabilirsiniz [BitSharestalk](https://bitsharestalk.org/index.php/board,104.0.html). \ No newline at end of file diff --git a/help/tr/components/AccountVotingWitnesses.md b/help/tr/components/AccountVotingWitnesses.md index 74a3381b8c..f03a574254 100644 --- a/help/tr/components/AccountVotingWitnesses.md +++ b/help/tr/components/AccountVotingWitnesses.md @@ -1 +1 @@ -[Taniklar](introduction/witness) Bitshares'in blok üreticileridirler. İşlemlerin geçerliliklerini teyit eder ve ağın güvenliğini sağlarlar. Dilediğiniz kadar tanığa oy verebilirsiniz, hepsi aynı miktarda alır. Tanık tekliflerini buradan takip edebilirsiniz: [Bitsharestalk](https://bitsharestalk.org/index.php/board,61.0.html). \ No newline at end of file +[Taniklar](introduction/witness) BitShares'in blok üreticileridirler. İşlemlerin geçerliliklerini teyit eder ve ağın güvenliğini sağlarlar. Dilediğiniz kadar tanığa oy verebilirsiniz, hepsi aynı miktarda alır. Tanık tekliflerini buradan takip edebilirsiniz: [BitSharestalk](https://bitsharestalk.org/index.php/board,61.0.html). \ No newline at end of file diff --git a/help/tr/components/AccountVotingWorkers.md b/help/tr/components/AccountVotingWorkers.md index 0c05549d5d..87ff0fea63 100644 --- a/help/tr/components/AccountVotingWorkers.md +++ b/help/tr/components/AccountVotingWorkers.md @@ -1 +1 @@ -[İşçiler](introduction/workers) BitShares'e özgü bir kavramdır. İşçiler, blok zincirinin kendisinden aldıkları maaş karşılığında hizmet sağlayan tekliflerdir. Teklifin amacını açıklayan bir web veya forum bağlantısı teklifin içine dahil edilmelidir, teklifleri burada görebilirsiniz : [Bitsharestalk](https://bitsharestalk.org/index.php/board,103.0.html). \ No newline at end of file +[İşçiler](introduction/workers) BitShares'e özgü bir kavramdır. İşçiler, blok zincirinin kendisinden aldıkları maaş karşılığında hizmet sağlayan tekliflerdir. Teklifin amacını açıklayan bir web veya forum bağlantısı teklifin içine dahil edilmelidir, teklifleri burada görebilirsiniz : [BitSharestalk](https://bitsharestalk.org/index.php/board,103.0.html). \ No newline at end of file diff --git a/web/app/assets/index-dev.html b/web/app/assets/index-dev.html index 1104de105e..2c296e7f4b 100644 --- a/web/app/assets/index-dev.html +++ b/web/app/assets/index-dev.html @@ -5,7 +5,7 @@ - BitShares 2.0 + BitShares