Merge branch 'staging'

CHANGELOG.md

@@ -1,3 +1,37 @@
+---------------------------------------------------------------------
+Release 2.0.171101
+---------------------------------------------------------------------
+New features
+--------
+- #634 The hosted wallet is now available at wallet.bitshares.org
+- #530 Withdraw amounts now factor in the gate fee
+- #538 The voting page has been completely revamped
+- #579 The margin position tab now includes a set of default assets
+- #632 The connection status is now visible throughout the app
+- #302 Your own orders are highlighted in the order book
+- #623 The Chinese translation has been updated
+- #670 My Trades now show dates instead of block numbers
+- #581 Market fees are now shown in the exchange page
+- #633 Clicking on connection status now takes you to Settings --> Access
+- #430 The asset page for bit assets now includes a sortable list of open margin position
+- #583 The portfolio is now sortable
+
+Bug fixes
+--------
+- #658 BTS trade button missing from portfolio view
+- #627 Display Feed Published value as an actual date/time in localized time zone
+- #52 Show a warning about core_exchange_rate at asset create/update page
+- #455 Trollbox has been removed completely
+- #645 Kexcoin has been removed from the dashboard
+- #622 Login screens have been harmonized
+- #580 Annual membership fee now is now shown as disabled
+- #607 Long line wrapping issue has been fixed
+- #590 'Reserve asset' changed to 'Burn asset'
+- #586 Input fields clear properly when switching between markets
+- #594 Leading decimals can now be input correctly in the exchange
+- #498 Orderbook scrollbars always visible
+- #673 Account tab headers are now highlighted
+
 ---------------------------------------------------------------------
 Release 2.0.171015
 ---------------------------------------------------------------------

README.md

@@ -48,7 +48,6 @@ npm install
 
 The dev server uses Express in combination with Webpack.
 
-<<<<<<< fcd7d7a6e6b91ecd0695bdac7368ef9dbaaec712
 Once all the packages have been installed you can start the development server by running:
 
 >开发服务器使用了EXPRESS和Webpack.

app/api/apiConfig.js

@@ -31,7 +31,7 @@ export const settingsAPIs = {
         {url: "wss://bitshares.crypto.fans/ws", location: "Munich, Germany"},
         {url: "wss://node.testnet.bitshares.eu", location: "Public Testnet Server (Frankfurt, Germany)"}
     ],
-    DEFAULT_FAUCET: "https://bitshares.openledger.info",
+    DEFAULT_FAUCET: "https://faucet.bitshares.eu",
     TESTNET_FAUCET: "https://faucet.testnet.bitshares.eu",
     RPC_URL: "https://openledger.info/api/"
 };

app/assets/locales/locale-en.json

@@ -2,7 +2,9 @@
     "counterpart": {
         "formats": {
             "date": {
-                "short_custom": "%e %b '%y"
+                "short_custom": "%e %b '%y",
+                "market_history": "%e/%m %H:%M:%S",
+                "market_history_us": "%m/%e %H:%M:%S"
             }
         }
     },
@@ -18,7 +20,7 @@
     "ru": "Русский"
   },
   "incognito": {
-    "no_support": "This Bitshares Wallet relies on Local Storage and IndexedDB which are not persistent when using Incognito Browsing. We recommend using a regular browsing session.",
+    "no_support": "This BitShares Wallet relies on Local Storage and IndexedDB which are not persistent when using Incognito Browsing. We recommend using a regular browsing session.",
     "ignore": "I understand, continue."
   },
   "sync_fail": {
@@ -1096,7 +1098,7 @@
     "not_first_account": "Since you already have an account, you will need to pay for this new account yourself. In order to do so, your account needs to have lifetime membership, which can be bought in the account page.",
     "must_be_ltm": "The fee paying account must be a lifetime member to perform that operation.",
     "backup_explain": "Clicking on the button below will generate a backup file with a .bin extension. This file is encrypted with your wallet password, and contains all the private keys for your accounts. It can be used to restore your wallet, or move it to a different computer/browser.",
-    "backup_new_account": "Congratulations, you've just created a new account on the Bitshares blockchain! It is strongly recommended that you make a backup of your wallet now. Without a backup there is no way to restore your account if something happens to your computer.",
+    "backup_new_account": "Congratulations, you've just created a new account on the BitShares blockchain! It is strongly recommended that you make a backup of your wallet now. Without a backup there is no way to restore your account if something happens to your computer.",
     "brainkey_not_backed_up": "This brainkey has never been backed up",
     "brainkey_backed_up": "This brainkey was last backed up",
     "new_password": "New password",
@@ -1170,7 +1172,7 @@
     "current_pass": "Current password",
     "no_wallet": "You do not have a local wallet yet",
     "generated": "Generated password",
-    "account_exp": "This account will be created on the blockchain and will be your address for any transfers you want to make! <strong>There are no long Bitcoin-style addresses in Bitshares!</strong>",
+    "account_exp": "This account will be created on the blockchain and will be your address for any transfers you want to make! <strong>There are no long Bitcoin-style addresses in BitShares!</strong>",
     "understand_1": "I understand that no one can recover my password if I lose or forget it",
     "understand_2": "I have written down or otherwise stored my password",
     "understand_3": " I understand that I will lose access to my funds if I lose my password",
@@ -1335,7 +1337,7 @@
       "coming_soon": "Coming soon"
     },
     "unavailable": "The gateway service for this asset is currently down, please try again later",
-    "unavailable_bridge": "The brdige service for this asset is currently down, please try again later",
+    "unavailable_bridge": "The bridge service for this asset is currently down, please try again later",
     "unavailable_OPEN": "The OpenLedger Gateway is down or not responding",
     "unavailable_RUDEX": "The RuDEX Gateway is down or not responding",
     "unavailable_TRADE": "The Blocktrades Bridge is down or not responding"