Skip to content

Commit

Permalink
Replace Bitshares with BitShares
Browse files Browse the repository at this point in the history
  • Loading branch information
svk31 committed Jan 20, 2017
1 parent 3d5c5e0 commit 7da55ca
Show file tree
Hide file tree
Showing 30 changed files with 61 additions and 61 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -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).

Expand Down Expand Up @@ -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.

Expand All @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion docs/_build/html/_sources/index.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Graphene UI documentation
========================================

Graphene UI is the open-source front-end for `Cryptonomex Graphene <https://github.com/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 <https://github.com/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:
Expand Down
2 changes: 1 addition & 1 deletion docs/_build/html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@

<div class="section" id="graphene-ui-documentation">
<h1>Graphene UI documentation<a class="headerlink" href="#graphene-ui-documentation" title="Permalink to this headline"></a></h1>
<p>Graphene UI is the open-source front-end for <a class="reference external" href="https://github.com/cryptonomex/graphene">Cryptonomex Graphene</a>. A live hosted wallet running a custom themed version of Graphene UI for Bitshares can be found at <a class="reference external" href="https://bitshares.openledger.info">https://bitshares.openledger.info</a></p>
<p>Graphene UI is the open-source front-end for <a class="reference external" href="https://github.com/cryptonomex/graphene">Cryptonomex Graphene</a>. A live hosted wallet running a custom themed version of Graphene UI for BitShares can be found at <a class="reference external" href="https://bitshares.openledger.info">https://bitshares.openledger.info</a></p>
<p>Contents:</p>
<div class="toctree-wrapper compound" id="the-basics">
<p class="caption"><span class="caption-text">The basics</span><a class="headerlink" href="#the-basics" title="Permalink to this toctree"></a></p>
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Graphene UI documentation
========================================

Graphene UI is the open-source front-end for `Cryptonomex Graphene <https://github.com/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 <https://github.com/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:
Expand Down
2 changes: 1 addition & 1 deletion help/cn/components/AccountVotingProxy.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
代理投票账户代表你行使投票权力。你可以在[Bitsharestalk](https://bitsharestalk.org/index.php/board,104.0.html)论坛上找到一些申请成为投票代理人的提案。
代理投票账户代表你行使投票权力。你可以在[BitSharestalk](https://bitsharestalk.org/index.php/board,104.0.html)论坛上找到一些申请成为投票代理人的提案。
2 changes: 1 addition & 1 deletion help/cn/components/AccountVotingWitnesses.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[见证人](introduction/witness) 是BitShares系统中区块的生产者。他们验证交易数据并维护网络安全。你可以投票选举你信任的人成为见证人。投票时,你选择的候选人将获得你投出的相同票数。见证人的竞选帖可在这里找到[Bitsharestalk](https://bitsharestalk.org/index.php/board,61.0.html)
[见证人](introduction/witness) 是BitShares系统中区块的生产者。他们验证交易数据并维护网络安全。你可以投票选举你信任的人成为见证人。投票时,你选择的候选人将获得你投出的相同票数。见证人的竞选帖可在这里找到[BitSharestalk](https://bitsharestalk.org/index.php/board,61.0.html)
2 changes: 1 addition & 1 deletion help/cn/components/AccountVotingWorkers.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[预算项目](introduction/workers) 是BitShares系统中独有的概念。他们是一些期望通过提供服务来从区块链获得奖金的工作项目提案。一项提案包含一个指向网站或论坛帖子的链接,在其中详细解释了工作项目的介绍。在这里[Bitsharestalk](https://bitsharestalk.org/index.php/board,103.0.html)可以看到一些提案。
[预算项目](introduction/workers) 是BitShares系统中独有的概念。他们是一些期望通过提供服务来从区块链获得奖金的工作项目提案。一项提案包含一个指向网站或论坛帖子的链接,在其中详细解释了工作项目的介绍。在这里[BitSharestalk](https://bitsharestalk.org/index.php/board,103.0.html)可以看到一些提案。
2 changes: 1 addition & 1 deletion help/en/components/AccountVoting.md
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion help/en/components/AccountVotingCommittee.md
Original file line number Diff line number Diff line change
@@ -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.
[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.
2 changes: 1 addition & 1 deletion help/en/components/AccountVotingProxy.md
Original file line number Diff line number Diff line change
@@ -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).
2 changes: 1 addition & 1 deletion help/en/components/AccountVotingWitnesses.md
Original file line number Diff line number Diff line change
@@ -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).
[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).
2 changes: 1 addition & 1 deletion help/en/components/AccountVotingWorkers.md
Original file line number Diff line number Diff line change
@@ -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).
[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).
2 changes: 1 addition & 1 deletion help/en/introduction/bridges_gateways.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion help/tr/accounts/permissions.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion help/tr/components/AccountVotingProxy.md
Original file line number Diff line number Diff line change
@@ -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).
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).
2 changes: 1 addition & 1 deletion help/tr/components/AccountVotingWitnesses.md
Original file line number Diff line number Diff line change
@@ -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).
[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).
2 changes: 1 addition & 1 deletion help/tr/components/AccountVotingWorkers.md
Original file line number Diff line number Diff line change
@@ -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).
[İşç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).
2 changes: 1 addition & 1 deletion web/app/assets/index-dev.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width"/>
<meta name="format-detection" content="telephone=no">
<!--<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>-->
<title>BitShares 2.0</title>
<title>BitShares</title>
<link rel="icon" type="image/x-icon" href="favicon.ico">
<style>
body {
Expand Down
2 changes: 1 addition & 1 deletion web/app/assets/index-electron.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width"/>
<meta name="format-detection" content="telephone=no">
<title>Bitshares</title>
<title>BitShares</title>
<link rel="icon" type="image/x-icon" href="favicon.ico">
<link rel="stylesheet" href="app.css">
<style>
Expand Down
2 changes: 1 addition & 1 deletion web/app/assets/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width"/>
<meta name="format-detection" content="telephone=no">
<!--<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>-->
<title>BitShares 2.0</title>
<title>BitShares</title>
<link rel="icon" type="image/x-icon" href="favicon.ico">
<link rel="stylesheet" href="app.css">
<style>
Expand Down
6 changes: 3 additions & 3 deletions web/app/assets/locales/locale-cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"sub_text_2": "同步你的计算机时钟后,请刷新本页面。如果你的时钟正确,那你连接的API服务器可能与区块链数据不同步,这种情况下,可尝试使用其他API服务器进行连接。"
},
"header": {
"title": "Bitshares (石墨烯)钱包",
"title": "BitShares (石墨烯)钱包",
"account": "账户",
"dashboard": "概览",
"explorer": "浏览",
Expand Down Expand Up @@ -56,7 +56,7 @@
},
"account": {
"trade": "交易",
"welcome": "欢迎使用 Bitshares (石墨烯)系统",
"welcome": "欢迎使用 BitShares (石墨烯)系统",
"assets": "资产",
"market_value": "市值",
"hour_24": "日涨跌幅%",
Expand Down Expand Up @@ -770,7 +770,7 @@
"older": "更早"
},
"footer": {
"title": "Bitshares (石墨烯)",
"title": "BitShares (石墨烯)",
"block": "最新区块",
"loading": "载入中...",
"backup": "需要备份",
Expand Down
6 changes: 3 additions & 3 deletions web/app/assets/locales/locale-de.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"tr": "Turkish"
},
"header": {
"title": "Bitshares UI",
"title": "BitShares UI",
"account": "Konto",
"dashboard": "Übersicht",
"explorer": "Explorer",
Expand Down Expand Up @@ -46,7 +46,7 @@
"cr_danger": "This position is currently being margin called. Consider adding collateral to bring the collateral ratio above %(mr)s or closing the position.",
"cr_warning": "This position has a low level of collateral, and will get margin called if the collateral ratio drops below %(mr)s. Consider adding collateral or closing the position.",
"propose_scam": "This proposal was created by a known scammer, do not approve it!",
"login": "This Bitshares wallet does not offer a traditional login but instead simply locks or unlocks a wallet that is <b>only</b> stored locally in your browser.<br/><br/>Whenever you close the wallet it will be locked and you will effectively be logged out.",
"login": "This BitShares wallet does not offer a traditional login but instead simply locks or unlocks a wallet that is <b>only</b> stored locally in your browser.<br/><br/>Whenever you close the wallet it will be locked and you will effectively be logged out.",
"buy_min": "You will receive at minimum this amount. If there are matching orders with a cheaper price than you specified, you will receive more than this amount."
},
"propose": "vorschlagen",
Expand Down Expand Up @@ -630,7 +630,7 @@
"walletLockTimeout": "Geldbörse automatische sperren (Sekunden)"
},
"footer": {
"title": "Bitshares",
"title": "BitShares",
"block": "Spitzenblock",
"loading": "Lade..."
},
Expand Down
Loading

0 comments on commit 7da55ca

Please sign in to comment.