diff --git a/README.md b/README.md index 20f310a1e1..442e479826 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Check gh-pages files against live website at https://www.myetherwallet.com | File Name| Status| |---|---| -| index.html |![embedded.html](https://filechecker.myetherwallet.com/check?localFile=https://raw.githubusercontent.com/kvhnuke/etherwallet/gh-pages/index.html&remoteFile=https://www.myetherwallet.com/index.html)| +| index.html |![embedded.html](https://filechecker.myetherwallet.com/check?localFile=https://raw.githubusercontent.com/kvhnuke/etherwallet/gh-pages/index.html&remoteFile=https://www.myetherwallet.com/index.html)| | embedded.html |![embedded.html](https://filechecker.myetherwallet.com/check?localFile=https://raw.githubusercontent.com/kvhnuke/etherwallet/gh-pages/embedded.html&remoteFile=https://www.myetherwallet.com/embedded.html)| | helpers.html |![embedded.html](https://filechecker.myetherwallet.com/check?localFile=https://raw.githubusercontent.com/kvhnuke/etherwallet/gh-pages/helpers.html&remoteFile=https://www.myetherwallet.com/helpers.html)| | signmsg.html |![signmsg.html](https://filechecker.myetherwallet.com/check?localFile=https://raw.githubusercontent.com/kvhnuke/etherwallet/gh-pages/signmsg.html&remoteFile=https://www.myetherwallet.com/signmsg.html)| @@ -123,7 +123,6 @@ If you want to help contribute, here's what you need to know to get it up and ru - We use angular and bootstrap. We used to use jQuery and Bootstrap until it was converted in April 2016. If you wonder why some things are set up funky, that's why. - The mercury branch is currently the active development branch. We then push the dist folder live to gh-pages, which then gets served to MyEtherWallet.com. - We use npm / gulp for compiling. There is a lot of stuff happening in the compilation. -- Old node setups can be found in in `json_relay_node` (node.js) & `json_relay_php` (php). These are great resources for developers looking to get started and launch a public node on a $40 Linode instance. **Getting Started** diff --git a/app/scripts/controllers/decryptWalletCtrl.js b/app/scripts/controllers/decryptWalletCtrl.js index 4c11ecd2b2..54755cf852 100644 --- a/app/scripts/controllers/decryptWalletCtrl.js +++ b/app/scripts/controllers/decryptWalletCtrl.js @@ -77,6 +77,9 @@ var decryptWalletCtrl = function($scope, $sce, walletService) { case nodes.nodeTypes.ETHO: $scope.HDWallet.dPath = $scope.HDWallet.hwEther1Path; break; + case nodes.nodeTypes.EGEM: + $scope.HDWallet.dPath = $scope.HDWallet.hwEtherGemPath; + break; default: $scope.HDWallet.dPath = $scope.HDWallet.ledgerPath; } diff --git a/app/scripts/directives/walletDecryptDrtv.html b/app/scripts/directives/walletDecryptDrtv.html index 7cb833ee33..8988eafe84 100644 --- a/app/scripts/directives/walletDecryptDrtv.html +++ b/app/scripts/directives/walletDecryptDrtv.html @@ -35,7 +35,7 @@