Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix tx adding code | Dan Finlay | 2016-11-30 | 1 | -25/+0 |
| | | | | | | | | | Broken in this commit: https://github.com/MetaMask/metamask-plugin/commit/bc39cd7b894ddf0f3724d4af3cfc30c2638e0939 Synchronous methods were added to an `async.waterfall` array. This commit also removes the delegate call checking, since we concluded it was misinformed. | ||||
* | Merge branch 'master' into dev | Dan Finlay | 2016-11-24 | 1 | -3/+3 |
|\ | |||||
| * | Merge branch 'master' into new-faucet | Dan Finlay | 2016-11-23 | 1 | -2/+2 |
| |\ | |||||
| | * | Add temporary morden explorer link support | Dan Finlay | 2016-11-22 | 1 | -1/+1 |
| | | | |||||
| | * | Add ropsten link support | Dan Finlay | 2016-11-22 | 1 | -2/+2 |
| | | | |||||
| * | | Ropsten has sole access to the faucet. | Kevin Serrano | 2016-11-23 | 1 | -3/+3 |
| | | | |||||
| * | | Add to changelog. | Kevin Serrano | 2016-11-23 | 1 | -1/+1 |
| |/ | |||||
* | | Cosmetic changes, rename links. | Kevin Serrano | 2016-11-24 | 1 | -9/+9 |
| | | |||||
* | | Add link back to unlock. | Kevin Serrano | 2016-11-24 | 1 | -0/+16 |
| | | |||||
* | | Fix proper behavior for restoring accounts when password forgotten. | Kevin Serrano | 2016-11-24 | 2 | -0/+2 |
| | | |||||
* | | Modify forgot password flow to go back to init screen. | Kevin Serrano | 2016-11-24 | 2 | -36/+1 |
| | | |||||
* | | Fix undefined provider menu item | Dan Finlay | 2016-11-23 | 1 | -2/+5 |
| | | |||||
* | | Linted | Dan Finlay | 2016-11-23 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #858 from MetaMask/i842-WaitForSeedWord | kumavis | 2016-11-23 | 2 | -5/+7 |
|\ \ | | | | | | | I842 wait for seed word | ||||
| * | | Restore ropsten link support | Dan Finlay | 2016-11-23 | 1 | -3/+3 |
| | | | |||||
| * | | Merge branch 'dev' into i842-WaitForSeedWord | Dan Finlay | 2016-11-23 | 1 | -2/+2 |
| |\ \ | |||||
| * | | | Use callback in placeSeedWord method. | Dan Finlay | 2016-11-22 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | When displaying seed words, we were not using a callback, which had some race condition potential. This is simply a little cleaner and more correct. Fixes #842 | ||||
* | | | | Merge branch 'dev' into dev-cleanup | Kevin Serrano | 2016-11-23 | 1 | -2/+2 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Make ropsten faucet button point at the correct url. | Kevin Serrano | 2016-11-23 | 1 | -2/+2 |
| |/ / | |||||
* | | | Fix camel casing on setSelectedAccount action. | Dan Finlay | 2016-11-22 | 3 | -4/+4 |
| | | | |||||
* | | | Change fauceting to become a response of an emit. | Kevin Serrano | 2016-11-22 | 1 | -2/+2 |
| | | | |||||
* | | | change all instances of selectedAddress to selectedAccount. | Kevin Serrano | 2016-11-22 | 9 | -21/+20 |
| | | | |||||
* | | | Remove entropy from encryption and project. | Kevin Serrano | 2016-11-22 | 2 | -3/+3 |
|/ / | |||||
* | | Merge pull request #837 from MetaMask/FixMenuItem | Kevin Serrano | 2016-11-22 | 1 | -7/+8 |
|\ \ | | | | | | | Fix custom provider menu item | ||||
| * | | Fix custom provider menu item | Dan Finlay | 2016-11-22 | 1 | -7/+8 |
| | | | | | | | | | | | | The Custom RPC menu item in the provider menu would not appear when Localhost:8545 was selected. | ||||
* | | | Merge branch 'dev' into i831-AddRopsten-Dev | Dan Finlay | 2016-11-22 | 31 | -509/+6078 |
|\| | | |/ |/| | |||||
| * | Convert conversion util to pure json. | Kevin Serrano | 2016-11-19 | 3 | -6/+5731 |
| | | |||||
| * | Revert one cb to previous state. | Kevin Serrano | 2016-11-16 | 1 | -1/+1 |
| | | |||||
| * | Minimize dispatches by using emitters and relying on state updates. | Kevin Serrano | 2016-11-16 | 1 | -19/+6 |
| | | |||||
| * | Re-enable disclaimer screen. Rename variables to reflect role more clearly. | Kevin Serrano | 2016-11-15 | 2 | -4/+4 |
| | | |||||
| * | Fix lint rules for ternary operator placement. | Kevin Serrano | 2016-11-12 | 1 | -18/+18 |
| | | |||||
| * | Typo fix. | Kevin Serrano | 2016-11-12 | 1 | -9/+9 |
| | | |||||
| * | Linting to the max. | Kevin Serrano | 2016-11-12 | 16 | -51/+36 |
| | | |||||
| * | Merge branch 'master' into i328-MultiVault | kumavis | 2016-11-11 | 2 | -2/+6 |
| |\ | |||||
| * \ | Merge branch 'master' into i328-MultiVault | kumavis | 2016-11-11 | 1 | -0/+9 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into i328-MultiVault | Frankie | 2016-11-11 | 3 | -16/+11 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into i328-MultiVault | Dan Finlay | 2016-11-08 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * | | | | | Remove insane actions hash | Dan Finlay | 2016-11-05 | 1 | -6/+2 |
| | | | | | | |||||
| * | | | | | Add reveal of seed words. | Kevin Serrano | 2016-11-02 | 3 | -0/+43 |
| | | | | | | |||||
| * | | | | | Make identicon tolerant of changing state | Dan Finlay | 2016-11-02 | 1 | -0/+17 |
| | | | | | | |||||
| * | | | | | Fixed bugs related to clearing caches when restoring to a new vault | Dan Finlay | 2016-11-02 | 3 | -3/+6 |
| | | | | | | |||||
| * | | | | | Make forgot password button. | Dan Finlay | 2016-11-02 | 3 | -32/+23 |
| | | | | | | |||||
| * | | | | | Fix seed phrase restore | Dan Finlay | 2016-11-02 | 2 | -4/+3 |
| | | | | | | |||||
| * | | | | | Made progress on parity for MultiVault | Kevin Serrano | 2016-11-02 | 6 | -171/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Deleted some unused items - Renamed files and paths to match with new locations. - Modified keyring controller logic to separate concerns. - Fix account naming issues. - Enable creation of new vault with default HD keyring. - Formatting issues. | ||||
| * | | | | | Linted | Kevin Serrano | 2016-11-01 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Implement seed word confirmation page. | Kevin Serrano | 2016-11-01 | 5 | -0/+392 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove logs. Move HD render files to ui/app. | ||||
| * | | | | | Make case condition more consistent. Remove extra action. Fix incorrect ↵ | Kevin Serrano | 2016-10-31 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | display of network. | ||||
| * | | | | | Add focus to password field. | Kevin Serrano | 2016-10-31 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | Add password warning div. | Kevin Serrano | 2016-10-31 | 1 | -2/+7 |
| | | | | | | |||||
| * | | | | | Modify first-screen design to match docs. | Kevin Serrano | 2016-10-31 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2016-10-29 | 5 | -21/+124 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | i328-MultiVault | ||||
| | * | | | | | Configure BIP44 Keychain as default one | Dan Finlay | 2016-10-29 | 2 | -4/+19 |
| | | | | | | | |||||
| | * | | | | | Fix identicon rendering | Dan Finlay | 2016-10-28 | 1 | -7/+6 |
| | | | | | | | |||||
| | * | | | | | Update first screen to match design. | Dan Finlay | 2016-10-28 | 2 | -10/+99 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into i328-MultiVault | Kevin Serrano | 2016-10-29 | 2 | -9/+8 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Phase out extra warning screen. | Kevin Serrano | 2016-10-26 | 6 | -128/+1 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into i328-MultiVault | Dan Finlay | 2016-10-22 | 2 | -1/+12 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Fix duplicate provider menu item bug | Dan Finlay | 2016-10-22 | 1 | -6/+1 |
| | | | | | | | | |||||
| * | | | | | | | Improved simple account generation | Dan Finlay | 2016-10-21 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Began adding first basic keyring | Dan Finlay | 2016-10-21 | 3 | -4/+19 |
| | | | | | | | | |||||
| * | | | | | | | Fix tests | Dan Finlay | 2016-10-21 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Linted & added salting to vault | Dan Finlay | 2016-10-21 | 3 | -8/+4 |
| | | | | | | | | |||||
| * | | | | | | | Fix state updating after vault creation and unlocking | Dan Finlay | 2016-10-21 | 2 | -2/+9 |
| | | | | | | | | |||||
| * | | | | | | | Commented out useless advanced not on init screen | Dan Finlay | 2016-10-21 | 1 | -0/+2 |
| | | | | | | | | |||||
| * | | | | | | | Change actions reference to keyringController to background | Dan Finlay | 2016-10-21 | 2 | -25/+25 |
| | | | | | | | | |||||
| * | | | | | | | Linted | Dan Finlay | 2016-10-21 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Git merge resolution. | Kevin Serrano | 2016-10-20 | 4 | -38/+179 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Intermediary commit. | Kevin Serrano | 2016-10-20 | 2 | -25/+25 |
| | | | | | | | | | |||||
| * | | | | | | | | Initial work on UI side | Kevin Serrano | 2016-10-16 | 4 | -1/+56 |
| | | | | | | | | | |||||
| * | | | | | | | | Add minimal method signatures to new keyring controller | Dan Finlay | 2016-10-13 | 1 | -1/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Remove additional deprecated action | Dan Finlay | 2016-10-13 | 1 | -15/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Remove opinionated seed word code | Dan Finlay | 2016-10-13 | 7 | -486/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Completely breaking all account maangement, I have removed the opinionated seed-word code from the UI. Web3 injection still seems to work. | ||||
* | | | | | | | | | Begin adding Ropsten support | Dan Finlay | 2016-11-22 | 5 | -3/+34 |
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ropsten links will still not work until Etherscan publishes their ropsten link format. At that time we will need to update ui/lib/account-link.js Otherwise, fixes #831 | ||||
* | | | | | | | | lint fix | Frankie | 2016-11-11 | 1 | -1/+2 |
| | | | | | | | | |||||
* | | | | | | | | Fix funny looking errors in conf-tx | Frankie | 2016-11-11 | 2 | -2/+5 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | detect tx error - show warning and fix gasLimit | kumavis | 2016-11-11 | 1 | -0/+9 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Unify warning functions. | Kevin G. Serrano | 2016-11-08 | 3 | -17/+12 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Fix github link on info page | Dan Finlay | 2016-11-01 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | Fix provider menu selection indication | Dan Finlay | 2016-10-26 | 2 | -9/+8 |
| |_|/ |/| | | |||||
* | | | Change regex in isHex function | Frankie | 2016-10-22 | 1 | -4/+1 |
| | | | |||||
* | | | clean up the isHex function | Frankie | 2016-10-22 | 1 | -3/+4 |
| | | | |||||
* | | | Add test and ability for isHex to handle hex strings with hex-prefix | Frankie | 2016-10-20 | 1 | -0/+1 |
| | | | |||||
* | | | Fix up wording | Frankie | 2016-10-20 | 1 | -1/+1 |
| | | | |||||
* | | | Add valdations to txData param | Frankie | 2016-10-20 | 2 | -0/+12 |
| |/ |/| | |||||
* | | Create callback and Clean-up details | Frankie | 2016-10-14 | 3 | -10/+12 |
| | | |||||
* | | fix spelling | Frankie | 2016-10-14 | 1 | -4/+2 |
| | | |||||
* | | Specify base 10 in bignumber | Frankie | 2016-10-14 | 1 | -1/+1 |
| | | |||||
* | | Fix gasPrice range | Frankie | 2016-10-14 | 4 | -16/+12 |
| | | |||||
* | | Merge branch 'master' into i#495CustomGasField | Frankie | 2016-10-12 | 6 | -16/+73 |
|\| | |||||
| * | Merge branch 'master' into i721-ScrollAccountList | Dan Finlay | 2016-10-12 | 5 | -15/+72 |
| |\ | |||||
| | * | Remove logs. | Kevin Serrano | 2016-10-12 | 1 | -3/+0 |
| | | | |||||
| | * | Cleanup. | Kevin Serrano | 2016-10-12 | 2 | -1/+4 |
| | | | |||||
| | * | Move tos hash logic to build phase. Create dynamic global variables based on ↵ | Kevin Serrano | 2016-10-12 | 1 | -1/+1 |
| | | | | | | | | | | | | build. | ||||
| | * | Prevent back/login buttons from appearing on the terms of service. | Kevin Serrano | 2016-10-07 | 1 | -0/+1 |
| | | | |||||
| | * | Rewritten to react standards. Way easier. | Kevin Serrano | 2016-10-05 | 1 | -9/+8 |
| | | | |||||
| | * | Linting. | Kevin Serrano | 2016-10-05 | 1 | -3/+3 |
| | | | |||||
| | * | Rename drop menu item to be consistent with naming. | Kevin Serrano | 2016-10-05 | 1 | -1/+1 |
| | | | |||||
| | * | Add relevant legal links to help page. | Kevin Serrano | 2016-10-05 | 1 | -8/+41 |
| | | | |||||
| | * | Make config page title consistent with menu item. | Kevin Serrano | 2016-10-05 | 1 | -1/+1 |
| | | | |||||
| | * | Add links to relevant legal pages on user agreement page. | Kevin Serrano | 2016-10-05 | 1 | -2/+6 |
| | | | |||||
| | * | Add conditional logic for adding listener. | Kevin Serrano | 2016-10-05 | 1 | -3/+5 |
| | | | |||||
| | * | Add padding to markdown paragraphs. | Kevin Serrano | 2016-10-05 | 1 | -0/+4 |
| | | | |||||
| | * | Merge branch 'master' into tos | Kevin Serrano | 2016-10-05 | 2 | -3/+7 |
| | |\ | |||||
| | * | | Add CSS rules for proper formatting. | Kevin Serrano | 2016-10-05 | 1 | -1/+7 |
| | | | | |||||
| | * | | Implemented scroll-to-bottom functionality for button activation. | Kevin Serrano | 2016-10-05 | 1 | -2/+10 |
| | | | | |||||
| * | | | Remove flex class from account list container | Dan Finlay | 2016-10-12 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' into i#495CustomGasField | Frankie | 2016-10-11 | 2 | -3/+7 |
|\| | | |||||
| * | | Merge branch 'master' into SmallerCopiedButton | Frankie | 2016-10-05 | 1 | -3/+6 |
| |\ \ | |||||
| | * | | Removed hex prefix from private key export | Dan Finlay | 2016-10-05 | 1 | -3/+6 |
| | |/ | | | | | | | | | | | | | | | | For compatibility with Jaxx, MEW, and Geth. Fixes #687 | ||||
| * / | Make seed word confirmation button font smaller | Dan Finlay | 2016-10-05 | 1 | -0/+1 |
| |/ | | | | | | | To avoid formatting glitches on some machines. | ||||
* / | Add custom gas field to send page | Frankie | 2016-10-11 | 3 | -33/+178 |
|/ | |||||
* | Space out purchase details on ShapeShift form | Dan Finlay | 2016-09-16 | 2 | -6/+5 |
| | |||||
* | Merge branch 'master' into i675-LoadingBuy | Dan Finlay | 2016-09-16 | 1 | -4/+15 |
|\ | |||||
| * | Fix CHANGELOG.md and restructure onClick events | Frankie | 2016-09-16 | 1 | -17/+12 |
| | | |||||
| * | linting | Frankie | 2016-09-16 | 1 | -21/+22 |
| | | |||||
| * | Merge branch 'master' into tx-viz | Frankie | 2016-09-16 | 8 | -17/+84 |
| |\ | |||||
| * | | add tx-viz link to transaction history | Frankie | 2016-09-16 | 1 | -12/+27 |
| | | | |||||
* | | | Show loading indication when selecting ShapeShift | Dan Finlay | 2016-09-16 | 3 | -11/+12 |
| |/ |/| | |||||
* | | Clean up some of the code | Frankie | 2016-09-16 | 2 | -28/+18 |
| | | |||||
* | | css - smaller balance warning | kumavis | 2016-09-16 | 1 | -1/+6 |
| | | |||||
* | | confTx - add insufficient balance warning message | kumavis | 2016-09-16 | 1 | -4/+6 |
| | | |||||
* | | confTx - show disabled accept btn + add colors | kumavis | 2016-09-16 | 2 | -37/+49 |
| | | |||||
* | | Merge branch 'master' into i#519buyButtonTxConf | Frankie | 2016-09-16 | 1 | -1/+3 |
|\| | |||||
| * | Do not show user rejection errors within our UI. | Dan Finlay | 2016-09-15 | 1 | -1/+3 |
| | | |||||
* | | Drop the buy button in the confTx view if account does not have enough eth | Frankie | 2016-09-16 | 7 | -13/+71 |
|/ | |||||
* | Merge branch 'master' into qrCode | Frankie | 2016-09-14 | 5 | -32/+12 |
|\ | |||||
| * | PendingTxDetails - partially remove imagify support | kumavis | 2016-09-14 | 1 | -26/+11 |
| | | |||||
| * | Merge branch 'library' of github.com:MetaMask/metamask-plugin into library | kumavis | 2016-09-13 | 3 | -10/+8 |
| |\ | |||||
| * | | ui - remove unused currentDomain prop | kumavis | 2016-09-13 | 4 | -6/+1 |
| | | | |||||
* | | | Remove unused code in qr actions | Frankie | 2016-09-13 | 1 | -2/+0 |
| | | | |||||
* | | | Merge branch 'master' into qrCode | Frankie | 2016-09-13 | 3 | -10/+8 |
|\ \ \ | | |/ | |/| | |||||
| * | | Ensure loading indication covers fox | Dan Finlay | 2016-09-13 | 1 | -0/+1 |
| | | | |||||
| * | | Fix single account list formatting | Dan Finlay | 2016-09-13 | 2 | -5/+2 |
| | | | |||||
| * | | Add accounts back to metamask state | Dan Finlay | 2016-09-13 | 1 | -5/+5 |
| |/ | |||||
* / | Add qrcode-npm to package.json and swap out Qr Code generator api for ↵ | Frankie | 2016-09-13 | 6 | -45/+47 |
|/ | | | | node-module | ||||
* | Revert "Add new eth-lightwallet salting to vault." | Frankie | 2016-09-13 | 5 | -15/+18 |
| | |||||
* | Fix account list formatting when only a single item. | Dan Finlay | 2016-09-12 | 2 | -10/+7 |
| | | | | | | - Makes account list items no longer flex larger than they should be. - Makes the add account button not flex larger than it should be. - Adds a line under the add account button to define its size. | ||||
* | Camelcase dataset key for react | Dan Finlay | 2016-09-11 | 3 | -8/+8 |
| | |||||
* | Merge branch 'master' into FixLogoPasswordFollow | Kevin Serrano | 2016-09-10 | 1 | -0/+2 |
|\ | |||||
| * | Show loading indication during unlocking. | Dan Finlay | 2016-09-09 | 1 | -0/+2 |
| | | |||||
* | | Fix fox logo password following | Dan Finlay | 2016-09-09 | 1 | -2/+1 |
|/ | | | | | | | | The new lightweight svg logo was not following text quite right. The new `lookAt` method was not using the same logic the module was using internally on mouse movement. I simply used that logic and exposed it via the old (expected) API, and got it behaving the way I like. | ||||
* | Merge branch 'master' into FixLogoLeak | Dan Finlay | 2016-09-09 | 6 | -9/+16 |
|\ | |||||
| * | Merge branch 'i#589pendingTxsIssue' of ↵ | Frankie | 2016-09-09 | 1 | -14/+3 |
| |\ | | | | | | | | | | https://github.com/MetaMask/metamask-plugin into i#589pendingTxsIssue | ||||
| | * | Merge branch 'master' into i#589pendingTxsIssue | Frankie | 2016-09-09 | 1 | -14/+3 |
| | |\ | |||||
| * | | | Fix wording in changelog and bug | Frankie | 2016-09-09 | 1 | -1/+1 |
| |/ / | |||||
| * | | Remove console.log | Frankie | 2016-09-09 | 1 | -1/+0 |
| | | | |||||
| * | | Add to CHANGELOG.md and Remove unnecessary catch | Frankie | 2016-09-09 | 1 | -9/+0 |
| | | | |||||
| * | | Merge branch 'master' into i#589pendingTxsIssue | Frankie | 2016-09-09 | 12 | -176/+111 |
| |\ \ | |||||
| * | | | Add network checks for unconfirmed Txs | Frankie | 2016-09-09 | 5 | -8/+25 |
| | | | | |||||
| * | | | Filter out pending txs based on network from tx history | Frankie | 2016-09-08 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix new logo related errors | Dan Finlay | 2016-09-09 | 1 | -3/+6 |
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Fixed logo deallocation related bugs, had to patch the logo repo itself to add a stopAnimating method. Also tuned up the logo to more closely resemble the old behavior. - Overlaps the title text - Points nose at cursor, not just front of eyes - Cursor is more "distant" from fox, to avoid extreme angles on edges. | ||||
* | | | Merge branch 'master' into AddNewLogo | Dan Finlay | 2016-09-09 | 11 | -175/+110 |
|\ \ \ | | |/ | |/| | |||||
| * | | Restore broken variable reference | Dan Finlay | 2016-09-09 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'ModularFiatBalance' of github.com:MetaMask/metamask-plugin ↵ | Dan Finlay | 2016-09-09 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | into ModularFiatBalance | ||||
| | * \ | Merge branch 'master' into ModularFiatBalance | Dan Finlay | 2016-09-09 | 1 | -1/+1 |
| | |\ \ | |||||
| * | | | | Fix double tooltip | Dan Finlay | 2016-09-09 | 1 | -10/+1 |
| |/ / / | |||||
| * | | | Merge branch 'master' into ModularFiatBalance | Dan Finlay | 2016-09-07 | 3 | -6/+5 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Linted | Dan Finlay | 2016-09-07 | 1 | -23/+22 |
| | | | | |||||
| * | | | Add fiat balances to tx conf view | Dan Finlay | 2016-09-07 | 2 | -9/+7 |
| | | | | |||||
| * | | | Got basic fiat display modularized | Dan Finlay | 2016-09-07 | 3 | -22/+26 |
| | | | | |||||
| * | | | Fix fiat-value | Dan Finlay | 2016-09-07 | 1 | -1/+0 |
| | | | | |||||
| * | | | Nearly finished factoring fiat value into eth-balance | Dan Finlay | 2016-09-07 | 9 | -109/+19 |
| | | | | |||||
| * | | | Continuing fiat balance modularization | Dan Finlay | 2016-09-04 | 3 | -73/+106 |
| | | | | |||||
* | | | | Fix logo usage for metamask-logo v2.0.0 | Dan Finlay | 2016-09-09 | 1 | -14/+3 |
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | - No longer need to check for webGL compliance (svg rendered!) - logo.canvas has been replaced with logo.container, since svg doesn't render to canvas but to an element. Otherwise, worked with very little effort!! Fixes #624 | ||||
* | | | Fix typo | John Weldon | 2016-09-08 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Fix capitalization. | Kevin Serrano | 2016-09-07 | 1 | -1/+1 |
| | | |||||
* | | Fix typos and refine wording. | Kevin Serrano | 2016-09-07 | 2 | -5/+4 |
|/ | |||||
* | Show conf screen after send request | Dan Finlay | 2016-09-02 | 1 | -2/+1 |
| | |||||
* | Skip loading indication from send screen | Dan Finlay | 2016-09-02 | 1 | -1/+0 |
| | |||||
* | Make element enumeration Edge compatible | Dan Finlay | 2016-08-30 | 1 | -10/+7 |
| | |||||
* | Add tolerance for failed form persisting | Dan Finlay | 2016-08-30 | 1 | -0/+7 |
| | |||||
* | Show custom rpc menu item always | Dan Finlay | 2016-08-30 | 1 | -6/+9 |
| | |||||
* | Fix spelling error | Dan Finlay | 2016-08-27 | 1 | -1/+1 |
| | |||||
* | make the back button its own function | Frankie | 2016-08-27 | 1 | -21/+22 |
| | |||||
* | Merge branch 'master' into i#563forgotPassword | Frankie | 2016-08-26 | 7 | -14/+110 |
|\ | |||||
| * | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-26 | 4 | -11/+97 |
| |\ | |||||
| | * | Linted | Dan Finlay | 2016-08-26 | 1 | -3/+1 |
| | | | |||||
| | * | Persist shapeshift form input values | Dan Finlay | 2016-08-26 | 1 | -3/+12 |
| | | | |||||
| | * | Persist send tx form field values | Dan Finlay | 2016-08-26 | 1 | -5/+14 |
| | | | |||||
| | * | Remove log | Dan Finlay | 2016-08-26 | 1 | -1/+0 |
| | | | |||||
| | * | Make restore vault form persist | Dan Finlay | 2016-08-26 | 1 | -3/+14 |
| | | | |||||
| | * | Add persistent form class | Dan Finlay | 2016-08-26 | 1 | -0/+60 |
| | | | |||||
| * | | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-25 | 2 | -7/+4 |
| |\| | |||||
| * | | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-24 | 2 | -7/+14 |
| |\ \ | |||||
| * | | | Linted | Dan Finlay | 2016-08-24 | 1 | -1/+0 |
| | | | | |||||
| * | | | Close notification on opening main UI | Dan Finlay | 2016-08-24 | 1 | -7/+1 |
| | | | | |||||
| * | | | Close popup even if last tx is dismissed from main UI | Dan Finlay | 2016-08-24 | 1 | -7/+8 |
| | | | | |||||
| * | | | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-23 | 6 | -15/+92 |
| |\ \ \ | |||||
| * | | | | Fix back button hiding on popup | Dan Finlay | 2016-08-23 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-23 | 14 | -35/+335 |
| |\ \ \ \ | |||||
| * | | | | | Linted | Dan Finlay | 2016-08-17 | 1 | -7/+4 |
| | | | | | | |||||
| * | | | | | MVP Popup Notifications Working | Dan Finlay | 2016-08-17 | 3 | -2/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm unsure which will be more performant: A notification using a trimmed down version of the UI, or using them both, letting the browser cache them both. In any case, here I've modified the normal UI to recognize when it's a popup, and change the UX accordingly in a few ways: - Hide the menu bar - Hide the back button from the notifications view. - When confirming the last tx, close the window. | ||||
| * | | | | | Unify notification and popup ui files | Dan Finlay | 2016-08-17 | 1 | -52/+0 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-17 | 9 | -7/+214 |
| |\ \ \ \ \ | |||||
| * | | | | | | Set up MVP for popup-based notifications. | Dan Finlay | 2016-08-17 | 1 | -0/+52 |
| | | | | | | | |||||
* | | | | | | | Change style on back button to be more like the rest of the app | Frankie | 2016-08-26 | 1 | -25/+55 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'master' into i#563forgotPassword | Frankie | 2016-08-26 | 10 | -29/+110 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Linted | Dan Finlay | 2016-08-25 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | Improve msg signing padding | Dan Finlay | 2016-08-25 | 1 | -5/+3 |
| | | | | | | | |||||
| * | | | | | | Fix empty sign message bug | Dan Finlay | 2016-08-25 | 1 | -1/+1 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge branch 'master' into fox-sub | Kevin Serrano | 2016-08-24 | 6 | -15/+92 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | More linting | Dan Finlay | 2016-08-23 | 2 | -4/+1 |
| | | | | | | |||||
| | * | | | | Linted | Dan Finlay | 2016-08-23 | 4 | -8/+4 |
| | | | | | | |||||
| | * | | | | Removed view more button, added account info button. | Dan Finlay | 2016-08-23 | 5 | -22/+67 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: - Also fixed bug that caused React warning when rendering the tx history. - Renamed 'Transactions' to 'History', since it now has more than that. | ||||
| | * | | | | Merge branch 'master' into i390-TransactionLimit | Dan Finlay | 2016-08-23 | 13 | -21/+316 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | * | | | | Merge branch 'master' into i390-TransactionLimit | Dan Finlay | 2016-08-19 | 2 | -13/+19 |
| | |\ \ \ \ | |||||
| | * | | | | | Change 'View More' to 'Show More' | Dan Finlay | 2016-08-19 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Linted | Dan Finlay | 2016-08-19 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Added `view more` button to transaction list | Dan Finlay | 2016-08-19 | 3 | -7/+45 |
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | Visible at the end of the transaction list, or if no transactions are listed, displayed right after the `No Transactions` message. | ||||
| * | | | | | Linting. | Kevin Serrano | 2016-08-24 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | Created option to pass in static file for fallback for logo. | Kevin Serrano | 2016-08-24 | 1 | -3/+5 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into fox-sub | Kevin Serrano | 2016-08-23 | 3 | -7/+10 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| * | | | | | Modify logic for component update. | Kevin Serrano | 2016-08-20 | 1 | -5/+4 |
| | | | | | | |||||
| * | | | | | Create replacement logo for non-webgl | Kevin Serrano | 2016-08-20 | 2 | -3/+10 |
| | | | | | | |||||
* | | | | | | Add a back button on lock screen to go back to init menu | Frankie | 2016-08-26 | 5 | -43/+136 |
| |/ / / / |/| | | | | |||||
* | | | | | Fix issue where if given a balance that does not need to be parsed will not ↵ | Frankie | 2016-08-20 | 3 | -7/+10 |
|/ / / / | | | | | | | | | | | | | be parsed | ||||
* | | | | Merge branch 'master' into shapeshiftTx | Dan Finlay | 2016-08-19 | 2 | -13/+19 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Lint and changelog. | Kevin Serrano | 2016-08-19 | 1 | -2/+2 |
| | | | | |||||
| * | | | Fix rounding issues. | Kevin Serrano | 2016-08-19 | 2 | -14/+20 |
| |/ / | |||||
* | | | Remove "+" from shapeshift tx and change wording in CHANGELOG | Frankie | 2016-08-19 | 1 | -21/+7 |
| | | | |||||
* | | | Make ballance teal for shapeshift tx and add to change log | Frankie | 2016-08-19 | 2 | -3/+5 |
| | | | |||||
* | | | Create a ShapeShift tx in tx History | Frankie | 2016-08-19 | 6 | -58/+97 |
| | | | |||||
* | | | Add api Public key | Frankie | 2016-08-19 | 1 | -0/+2 |
| | | | |||||
* | | | Merge branch 'master' into shapeshiftTx | Frankie | 2016-08-19 | 11 | -8/+222 |
|\| | | |||||
| * | | Added compliance for tests and properly accounts for N/A conversions. | Kevin Serrano | 2016-08-17 | 2 | -2/+2 |
| | | | |||||
| * | | Lint. | Kevin Serrano | 2016-08-17 | 1 | -4/+5 |
| | | | |||||
| * | | Remove logs. | Kevin Serrano | 2016-08-17 | 1 | -3/+0 |
| | | | |||||
| * | | Hide conversions when API fails. | Kevin Serrano | 2016-08-17 | 1 | -29/+42 |
| | | | |||||
| * | | Change account list balance rendering. | Kevin Serrano | 2016-08-17 | 2 | -3/+6 |
| | | | |||||
| * | | Remove console logs. | Kevin Serrano | 2016-08-17 | 1 | -2/+0 |
| | | | |||||
| * | | Add recent conversion date. | Kevin Serrano | 2016-08-17 | 1 | -0/+4 |
| | | | |||||
| * | | Add fallback to API failure. | Kevin Serrano | 2016-08-17 | 1 | -1/+5 |
| | | | |||||
| * | | Remove react-select as dependency. | Kevin Serrano | 2016-08-17 | 1 | -7/+0 |
| | | | |||||
| * | | Remove logging. Clean up duplicate entries in currency list. | Kevin Serrano | 2016-08-17 | 2 | -3/+2 |
| | | | |||||
| * | | linting and ignoring. | Kevin Serrano | 2016-08-17 | 6 | -15/+8 |
| | | | |||||
| * | | Divided eth components for tx and account detail. | Kevin Serrano | 2016-08-17 | 3 | -15/+128 |
| | | | |||||
| * | | Merge master. | Kevin Serrano | 2016-08-16 | 14 | -43/+1078 |
| |\| | |||||
| | * | Add margin to "go to test faucet" button and show more of the address on qr ↵ | Frankie | 2016-08-15 | 2 | -1/+8 |
| | | | | | | | | | | | | code page | ||||
| * | | Did not previously call functions before! | Kevin Serrano | 2016-08-10 | 1 | -0/+3 |
| | | | |||||
| * | | Fix default value. Add loading indication for async. | Kevin Serrano | 2016-08-10 | 2 | -3/+5 |
| | | | |||||
| * | | Enable full listing of supported currencies by Cryptonator. | Kevin Serrano | 2016-08-10 | 2 | -6/+15 |
| | | | |||||
| * | | Add fix for zero balance shorten. | Kevin Serrano | 2016-08-08 | 1 | -0/+2 |
| | | | |||||
| * | | Get fiat numbers rendering on tooltip. Need to find way to create line breaks. | Kevin Serrano | 2016-08-06 | 2 | -3/+22 |
| | | | |||||
| * | | Holding off on select formatting for now. Renamed keys for options. | Kevin Serrano | 2016-08-05 | 2 | -5/+5 |
| | | | |||||
| * | | Create default values for metamask state for conversion. Fix config files ↵ | Kevin Serrano | 2016-08-05 | 1 | -0/+3 |
| | | | | | | | | | | | | for ui dev. | ||||
| * | | currency now selectable and save-able. | Kevin Serrano | 2016-08-05 | 2 | -2/+25 |
| | | | |||||
| * | | Merge branch 'master' into usd-conversion | Kevin Serrano | 2016-08-05 | 8 | -13/+58 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into usd-conversion | Kevin Serrano | 2016-07-26 | 1 | -2/+1 |
| |\ \ \ | |||||
| * \ \ \ | Fix merge conflicts. Fix typos. Ensure currency immediately updated on load. | Kevin Serrano | 2016-07-23 | 7 | -2/+169 |
| |\ \ \ \ | |||||
| * | | | | | Linting! | Kevin Serrano | 2016-07-23 | 2 | -3/+3 |
| | | | | | |