| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into kovan-faucet-instructions | Kevin Serrano | 2017-03-28 | 1 | -0/+3 |
|\ |
|
| * | Fix edge case where notice does not require scrollbar. | Kevin Serrano | 2017-03-28 | 1 | -0/+3 |
* | | Add link to kovan faucet instructions. | Kevin Serrano | 2017-03-28 | 1 | -2/+9 |
|/ |
|
* | Merge branch 'master' into kovan-notice | Dan Finlay | 2017-03-25 | 4 | -434/+538 |
|\ |
|
| * | Fix tx selecting bug | Dan Finlay | 2017-03-25 | 1 | -0/+1 |
| * | Remove unnecessary log | Dan Finlay | 2017-03-25 | 1 | -2/+0 |
| * | Disable accept button when gas limit is too low | Dan Finlay | 2017-03-25 | 1 | -8/+5 |
| * | Make gas calculations on render more consistent | Dan Finlay | 2017-03-24 | 1 | -10/+16 |
| * | Fix initial tx fee estimation | Dan Finlay | 2017-03-24 | 2 | -4/+5 |
| * | Fix a couple things | Dan Finlay | 2017-03-24 | 2 | -15/+42 |
| * | Make reset button clear errors | Dan Finlay | 2017-03-24 | 1 | -0/+1 |
| * | Fix initial gas price estimate | Dan Finlay | 2017-03-24 | 1 | -4/+5 |
| * | Prevent default for reset and reject buttons | Dan Finlay | 2017-03-24 | 1 | -1/+2 |
| * | Override browser default validation message | Dan Finlay | 2017-03-24 | 1 | -0/+1 |
| * | Fix some broken refs | Dan Finlay | 2017-03-24 | 1 | -2/+2 |
| * | Merge branch 'i1234-HardGasLimits-BrowserForm' of github.com:MetaMask/metamas... | Dan Finlay | 2017-03-24 | 4 | -2/+18 |
| |\ |
|
| | * | Merge branch 'master' into i1234-HardGasLimits-BrowserForm | Kevin Serrano | 2017-03-24 | 1 | -1/+1 |
| | |\ |
|
| | | * | Enable etherscan linking on Kovan transaction list items. | Kevin Serrano | 2017-03-23 | 1 | -1/+1 |
| | * | | Merge branch 'master' into i1234-HardGasLimits-BrowserForm | Dan Finlay | 2017-03-23 | 3 | -1/+17 |
| | |\| |
|
| * | | | Combine pending-tx-details component into pending-tx-details | Dan Finlay | 2017-03-24 | 2 | -370/+346 |
| |/ / |
|
| * | | Merge branch 'master' into i1234-HardGasLimits-BrowserForm | Dan Finlay | 2017-03-23 | 1 | -36/+56 |
| |\ \ |
|
| * | | | Got basic validations working | Dan Finlay | 2017-03-23 | 3 | -94/+179 |
| * | | | Some progress | Dan Finlay | 2017-03-23 | 2 | -7/+16 |
* | | | | Reset disabled state for confirm button after every notice. | Kevin Serrano | 2017-03-23 | 1 | -1/+4 |
| |_|/
|/| | |
|
* | | | Merge branch 'master' into i238-kovan | Kevin Serrano | 2017-03-23 | 1 | -0/+1 |
|\ \ \ |
|
| * | | | Hide the password in the private key retrieval screen. | Kevin Serrano | 2017-03-23 | 1 | -0/+1 |
| | |/
| |/| |
|
* | | | Add kovan to drop-menu-item | Kevin Serrano | 2017-03-23 | 1 | -1/+4 |
* | | | Add conditional kovan to current network component. | Kevin Serrano | 2017-03-23 | 1 | -0/+12 |
|/ / |
|
* / | Adjust private key confirmation style and logic. | Kevin Serrano | 2017-03-21 | 1 | -36/+56 |
|/ |
|
* | Improve personal_sign style | Dan Finlay | 2017-03-17 | 2 | -11/+23 |
* | Merge branch 'master' into i1165-predictive | Kevin Serrano | 2017-03-15 | 1 | -2/+2 |
|\ |
|
| * | Rename variables to proper currency state variables. | Kevin Serrano | 2017-03-15 | 1 | -2/+2 |
* | | Minor change in removing opts object. | Kevin Serrano | 2017-03-15 | 1 | -4/+1 |
* | | Add comments. | Kevin Serrano | 2017-03-11 | 1 | -0/+5 |
* | | Allow for adding recently used addresses to address book. | Kevin Serrano | 2017-03-10 | 1 | -2/+11 |
* | | Create distinct labels and names for addresses. | Kevin Serrano | 2017-03-10 | 1 | -1/+5 |
* | | Display owned addresses in datalist. | Kevin Serrano | 2017-03-10 | 1 | -0/+10 |
|/ |
|
* | Add ENS click to copy | Dan Finlay | 2017-03-09 | 1 | -9/+8 |
* | Get basic ENS working | Dan Finlay | 2017-03-09 | 6 | -52/+119 |
|\ |
|
| * | Remove log | Dan Finlay | 2017-03-07 | 1 | -1/+0 |
| * | Render personal_sign messages as utf-8 text | Dan Finlay | 2017-03-07 | 2 | -12/+46 |
| * | Prevent submission of invalid gas parameters. | Kevin Serrano | 2017-03-02 | 2 | -3/+26 |
| * | Various improvements to gas input. | Kevin Serrano | 2017-03-02 | 3 | -27/+22 |
| * | Only allow numbers in gas inputs | Dan Finlay | 2017-03-02 | 1 | -0/+1 |
* | | Add ens recognition to send form input | Dan Finlay | 2017-03-01 | 1 | -0/+131 |
|/ |
|
* | Add reset button to reset gas fields. | Kevin Serrano | 2017-03-01 | 2 | -4/+20 |
* | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76... | Dan Finlay | 2017-03-01 | 1 | -2/+12 |
|\ |
|
| * | Gas and Gaslimit revert to default if set to 0 | Kevin Serrano | 2017-03-01 | 1 | -2/+12 |
* | | Add a couple more debug logs | Dan Finlay | 2017-03-01 | 1 | -0/+1 |
|/ |
|
* | lints | Kevin Serrano | 2017-03-01 | 1 | -3/+0 |
* | Remove advanced options for now. | Kevin Serrano | 2017-03-01 | 1 | -15/+4 |
* | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76... | Dan Finlay | 2017-03-01 | 1 | -0/+2 |
|\ |
|
| * | lint | Kevin Serrano | 2017-03-01 | 1 | -2/+4 |
* | | Linted | Dan Finlay | 2017-03-01 | 1 | -2/+2 |
* | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76... | Dan Finlay | 2017-03-01 | 2 | -4/+17 |
|\| |
|
| * | Hide gas options behind an advanced options checkbox. | Kevin Serrano | 2017-03-01 | 1 | -4/+16 |
| * | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76... | Kevin Serrano | 2017-03-01 | 1 | -30/+38 |
| |\ |
|
| * | | Add margins to align. | Kevin Serrano | 2017-03-01 | 1 | -0/+1 |
* | | | Remove gasMultiplier txMeta param | Dan Finlay | 2017-03-01 | 1 | -5/+1 |
| |/
|/| |
|
* | | Fix infinite loop bug | Dan Finlay | 2017-03-01 | 1 | -30/+38 |
|/ |
|
* | Reorder rows for better table logic | Dan Finlay | 2017-02-28 | 1 | -32/+37 |
* | Emit updated tx values on accept click | Dan Finlay | 2017-02-28 | 1 | -0/+7 |
* | Remove unused function | Dan Finlay | 2017-02-28 | 1 | -5/+0 |
* | Got gas live re-estimating | Dan Finlay | 2017-02-28 | 2 | -20/+23 |
* | Align input fields for gas. | Kevin Serrano | 2017-02-28 | 1 | -0/+1 |
* | Fix merge conflicts. | Kevin Serrano | 2017-02-28 | 2 | -8/+68 |
|\ |
|
| * | Linted | Dan Finlay | 2017-02-28 | 2 | -12/+6 |
| * | Add non-working gas recalculating logic to tx-details view | Dan Finlay | 2017-02-28 | 1 | -6/+69 |
* | | Further styling to get hex component working. Fix some typos. | Kevin Serrano | 2017-02-28 | 3 | -16/+44 |
|/ |
|
* | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into i76... | Kevin Serrano | 2017-02-28 | 3 | -5/+109 |
|\ |
|
| * | Merge branch 'master' into i765-gaslimits | Dan Finlay | 2017-02-28 | 3 | -5/+109 |
| |\ |
|
| | * | Improve pending tx blue dot style | Dan Finlay | 2017-02-24 | 1 | -5/+1 |
| | * | Fix cancel msg signing behavior. | Dan Finlay | 2017-02-24 | 1 | -1/+1 |
| | * | Make personal sign view look nice | Dan Finlay | 2017-02-24 | 1 | -5/+16 |
| | * | Got personal_sign working | Dan Finlay | 2017-02-24 | 2 | -2/+52 |
| | * | Add alternate UI for pending personal_sign messages | Dan Finlay | 2017-02-24 | 1 | -9/+0 |
| | * | Add personal sign actions and template | Dan Finlay | 2017-02-23 | 1 | -0/+56 |
* | | | Move input boxes into table and into details component. | Kevin Serrano | 2017-02-28 | 3 | -17/+39 |
|/ / |
|
* | | Make gasPrice accessible to the UI. | Kevin Serrano | 2017-02-25 | 1 | -2/+1 |
* | | Merge github.com:MetaMask/metamask-plugin into i765-gaslimits | Kevin Serrano | 2017-02-24 | 1 | -2/+11 |
|\| |
|
| * | Notices must be scrolled down to proceed from. | Kevin Serrano | 2017-02-21 | 1 | -0/+9 |
| * | Fix typo. | Kevin Serrano | 2017-02-21 | 1 | -2/+2 |
* | | Broke hex decimal input into its own component | Dan Finlay | 2017-02-18 | 2 | -24/+71 |
* | | Change state to props, add modifiable fields. | Kevin Serrano | 2017-02-18 | 1 | -9/+33 |
|/ |
|
* | Merge branch 'master' into i1089-networkfront | Kevin Serrano | 2017-02-16 | 1 | -0/+9 |
|\ |
|
| * | Revert old style message sighing | Frankie | 2017-02-10 | 1 | -0/+9 |
* | | Change networks from lock screen. | Kevin Serrano | 2017-02-16 | 1 | -1/+1 |
|/ |
|
* | Merge branch 'dev' into messageManagerCleanUp | Frankie | 2017-02-02 | 5 | -5/+2 |
|\ |
|
| * | rename selectedAccount to selectedAddress | kumavis | 2017-01-31 | 5 | -5/+2 |
* | | Clean up message manger includes: | Frankie | 2017-01-29 | 3 | -10/+3 |
|/ |
|
* | Merge branch 'dev' into i715-AddJsonImport | Dan Finlay | 2017-01-19 | 1 | -1/+1 |
|\ |
|
| * | Merge branch 'master' into Version-3.1.0 | Dan Finlay | 2017-01-19 | 1 | -1/+1 |
| |\ |
|
| | * | Merge branch 'master' into fixSignedVsSubmitted | Frankie | 2017-01-19 | 2 | -6/+5 |
| | |\ |
|
| | * | | Fix the dissplay for submitted transactions and the listner wating to hear wh... | Frankie | 2017-01-19 | 1 | -1/+1 |
* | | | | Add ability to import v3 JSON wallets | Dan Finlay | 2017-01-19 | 1 | -1/+7 |
|/ / / |
|
* | | | Merge branch 'i328-MultiVault-v1' into i715-AddImportMenu | Dan Finlay | 2017-01-18 | 2 | -36/+81 |
|\ \ \
| |_|/
|/| | |
|
| * | | Linted | Dan Finlay | 2016-11-05 | 1 | -5/+4 |
| * | | Convert buy subview to new tab bar component | Dan Finlay | 2016-11-05 | 1 | -36/+47 |
| * | | Scaffold new account view | Dan Finlay | 2016-11-05 | 1 | -0/+35 |
* | | | Merge branch 'master' into dev | Dan Finlay | 2017-01-17 | 2 | -6/+5 |
|\ \ \
| |_|/
|/| | |
|
| * | | update coinbase info and view | Frankie | 2017-01-11 | 1 | -4/+4 |
| * | | remove network Id 2 from explorer link and Add network Id 3 | Frances Pangilinan | 2016-12-21 | 1 | -2/+1 |
* | | | Clean up code | Frankie | 2017-01-14 | 2 | -30/+35 |
* | | | Fix sorting and instances where something could be undefined | Frankie | 2017-01-12 | 1 | -2/+2 |
* | | | Fix wording and icon of failed txs | Frankie | 2017-01-12 | 1 | -0/+6 |
* | | | Take some of the tx Logic out of the UI and create a visble state for pending... | Frankie | 2017-01-12 | 4 | -22/+35 |
* | | | Linting. | Kevin Serrano | 2017-01-05 | 1 | -1/+0 |
* | | | Make network somewhat more modular, add new network indicator. | Kevin Serrano | 2017-01-05 | 1 | -5/+2 |
* | | | Merge remote-tracking branch 'origin/kumavis-readme-gource' into RevertTxManager | Dan Finlay | 2017-01-03 | 1 | -2/+2 |
|\ \ \ |
|
| * \ \ | Merge branch 'dev' into TxManager | Frankie | 2016-12-24 | 1 | -0/+110 |
| |\ \ \ |
|
| * \ \ \ | Merge branch 'dev' into TxManager | Frankie | 2016-12-22 | 2 | -15/+0 |
| |\ \ \ \ |
|
| * | | | | | First pass at revision requests | Frances Pangilinan | 2016-12-22 | 1 | -2/+2 |
* | | | | | | Fix rendering of loose accounts | Dan Finlay | 2016-12-24 | 1 | -1/+3 |
| |_|/ / /
|/| | | | |
|
* | | | | | Linted | Dan Finlay | 2016-12-21 | 1 | -0/+110 |
| |/ / /
|/| | | |
|
* | | | | Merged master into dev | Dan Finlay | 2016-12-20 | 2 | -15/+0 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Remove morden testnet provider | Dan Finlay | 2016-12-16 | 2 | -15/+0 |
* | | | | Revert "Interface enhancements" | Dan Finlay | 2016-12-17 | 4 | -12/+35 |
* | | | | Better account details view | Luis Iván Cuende | 2016-12-15 | 3 | -4/+6 |
* | | | | Better editable label | Luis Iván Cuende | 2016-12-15 | 2 | -32/+7 |
| |/ /
|/| | |
|
* | | | Fix tx adding code | Dan Finlay | 2016-11-30 | 1 | -25/+0 |
* | | | Merge branch 'master' into dev | Dan Finlay | 2016-11-24 | 1 | -3/+3 |
|\| | |
|
| * | | 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 |
* | | | 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 |
* | | | | change all instances of selectedAddress to selectedAccount. | Kevin Serrano | 2016-11-22 | 2 | -2/+2 |
|/ / / |
|
* | | | Merge branch 'dev' into i831-AddRopsten-Dev | Dan Finlay | 2016-11-22 | 9 | -27/+32 |
|\ \ \
| |/ /
|/| | |
|
| * | | Fix lint rules for ternary operator placement. | Kevin Serrano | 2016-11-12 | 1 | -18/+18 |
| * | | Linting to the max. | Kevin Serrano | 2016-11-12 | 9 | -38/+27 |
| * | | Merge branch 'master' into i328-MultiVault | kumavis | 2016-11-11 | 1 | -1/+1 |
| |\ \ |
|
| * \ \ | Merge branch 'master' into i328-MultiVault | kumavis | 2016-11-11 | 1 | -0/+9 |
| |\ \ \ |
|
| * \ \ \ | Merge branch 'master' into i328-MultiVault | Frankie | 2016-11-11 | 2 | -3/+3 |
| |\ \ \ \
| | |_|_|/
| |/| | | |
|
| * | | | | Make identicon tolerant of changing state | Dan Finlay | 2016-11-02 | 1 | -0/+17 |
| * | | | | Make case condition more consistent. Remove extra action. Fix incorrect displ... | Kevin Serrano | 2016-10-31 | 1 | -1/+2 |
| * | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3... | Kevin Serrano | 2016-10-29 | 1 | -7/+6 |
| |\ \ \ \ |
|
| | * | | | | Fix identicon rendering | Dan Finlay | 2016-10-28 | 1 | -7/+6 |
* | | | | | | Begin adding Ropsten support | Dan Finlay | 2016-11-22 | 2 | -1/+20 |
| |_|_|_|/
|/| | | | |
|
* | | | | | Fix funny looking errors in conf-tx | Frankie | 2016-11-11 | 1 | -1/+1 |
| |_|_|/
|/| | | |
|
* | | | | detect tx error - show warning and fix gasLimit | kumavis | 2016-11-11 | 1 | -0/+9 |
| |_|/
|/| | |
|
* | | | Unify warning functions. | Kevin G. Serrano | 2016-11-08 | 2 | -3/+3 |
|/ / |
|
* / | Fix provider menu selection indication | Dan Finlay | 2016-10-26 | 1 | -1/+1 |
|/ |
|
* | Create callback and Clean-up details | Frankie | 2016-10-14 | 1 | -3/+3 |
* | Specify base 10 in bignumber | Frankie | 2016-10-14 | 1 | -1/+1 |
* | Fix gasPrice range | Frankie | 2016-10-14 | 2 | -14/+9 |
* | Merge branch 'master' into i#495CustomGasField | Frankie | 2016-10-11 | 1 | -3/+6 |
|\ |
|
| * | Removed hex prefix from private key export | Dan Finlay | 2016-10-05 | 1 | -3/+6 |
* | | Add custom gas field to send page | Frankie | 2016-10-11 | 2 | -0/+65 |
|/ |
|
* | Space out purchase details on ShapeShift form | Dan Finlay | 2016-09-16 | 1 | -4/+3 |
* | 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 | 3 | -8/+30 |
| |\ |
|
| * | | 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 | 2 | -0/+50 |
| |/
|/| |
|
* | | Clean up some of the code | Frankie | 2016-09-16 | 1 | -21/+4 |
* | | 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 | 1 | -32/+28 |
* | | Drop the buy button in the confTx view if account does not have enough eth | Frankie | 2016-09-16 | 3 | -8/+44 |
|/ |
|
* | Merge branch 'master' into qrCode | Frankie | 2016-09-14 | 1 | -26/+11 |
|\ |
|
| * | PendingTxDetails - partially remove imagify support | kumavis | 2016-09-14 | 1 | -26/+11 |
* | | Add qrcode-npm to package.json and swap out Qr Code generator api for node-mo... | Frankie | 2016-09-13 | 1 | -3/+11 |
|/ |
|
* | Revert "Add new eth-lightwallet salting to vault." | Frankie | 2016-09-13 | 1 | -2/+2 |
* | Camelcase dataset key for react | Dan Finlay | 2016-09-11 | 1 | -2/+2 |
* | Fix fox logo password following | Dan Finlay | 2016-09-09 | 1 | -2/+1 |
* | Fix new logo related errors | Dan Finlay | 2016-09-09 | 1 | -3/+6 |
* | Merge branch 'master' into AddNewLogo | Dan Finlay | 2016-09-09 | 7 | -160/+97 |
|\ |
|
| * | Restore broken variable reference | Dan Finlay | 2016-09-09 | 1 | -0/+1 |
| * | Fix double tooltip | Dan Finlay | 2016-09-09 | 1 | -10/+1 |
| * | Merge branch 'master' into ModularFiatBalance | Dan Finlay | 2016-09-07 | 2 | -2/+2 |
| |\ |
|
| * | | Linted | Dan Finlay | 2016-09-07 | 1 | -23/+22 |
| * | | Add fiat balances to tx conf view | Dan Finlay | 2016-09-07 | 1 | -6/+5 |
| * | | 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 | 6 | -97/+8 |
| * | | 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 |
| |/
|/| |
|
* | | Fix capitalization. | Kevin Serrano | 2016-09-07 | 1 | -1/+1 |
* | | Fix typos and refine wording. | Kevin Serrano | 2016-09-07 | 1 | -1/+1 |
|/ |
|
* | Fix spelling error | Dan Finlay | 2016-08-27 | 1 | -1/+1 |
* | Persist shapeshift form input values | Dan Finlay | 2016-08-26 | 1 | -3/+12 |
* | Linted | Dan Finlay | 2016-08-25 | 1 | -1/+0 |
* | Improve msg signing padding | Dan Finlay | 2016-08-25 | 1 | -5/+3 |
* | Merge branch 'master' into fox-sub | Kevin Serrano | 2016-08-24 | 4 | -11/+65 |
|\ |
|
| * | More linting | Dan Finlay | 2016-08-23 | 2 | -4/+1 |
| * | Linted | Dan Finlay | 2016-08-23 | 3 | -7/+3 |
| * | Removed view more button, added account info button. | Dan Finlay | 2016-08-23 | 4 | -17/+58 |
| * | Merge branch 'master' into i390-TransactionLimit | Dan Finlay | 2016-08-23 | 7 | -12/+235 |
| |\ |
|
| * \ | Merge branch 'master' into i390-TransactionLimit | Dan Finlay | 2016-08-19 | 1 | -8/+9 |
| |\ \ |
|
| * | | | 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 | 1 | -7/+26 |
* | | | | 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 | 2 | -5/+8 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Fix issue where if given a balance that does not need to be parsed will not b... | Frankie | 2016-08-20 | 2 | -5/+8 |
* | | | | Modify logic for component update. | Kevin Serrano | 2016-08-20 | 1 | -5/+4 |
* | | | | Create replacement logo for non-webgl | Kevin Serrano | 2016-08-20 | 1 | -2/+8 |
|/ / / |
|
* | | | Merge branch 'master' into shapeshiftTx | Dan Finlay | 2016-08-19 | 1 | -8/+9 |
|\ \ \
| | |/
| |/| |
|
| * | | Fix rounding issues. | Kevin Serrano | 2016-08-19 | 1 | -8/+9 |
| |/ |
|
* | | 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 | 2 | -55/+90 |
* | | Add api Public key | Frankie | 2016-08-19 | 1 | -0/+2 |
* | | Merge branch 'master' into shapeshiftTx | Frankie | 2016-08-19 | 4 | -2/+152 |
|\| |
|
| * | Added compliance for tests and properly accounts for N/A conversions. | Kevin Serrano | 2016-08-17 | 1 | -1/+1 |
| * | 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 |
| * | Add fallback to API failure. | Kevin Serrano | 2016-08-17 | 1 | -1/+5 |
| * | linting and ignoring. | Kevin Serrano | 2016-08-17 | 2 | -2/+1 |
| * | Divided eth components for tx and account detail. | Kevin Serrano | 2016-08-17 | 2 | -14/+126 |
| * | Merge master. | Kevin Serrano | 2016-08-16 | 6 | -16/+657 |
| |\ |
|
| | * | Add margin to "go to test faucet" button and show more of the address on qr c... | Frankie | 2016-08-15 | 2 | -1/+8 |
| * | | Fix default value. Add loading indication for async. | Kevin Serrano | 2016-08-10 | 1 | -3/+1 |
| * | | Get fiat numbers rendering on tooltip. Need to find way to create line breaks. | Kevin Serrano | 2016-08-06 | 1 | -2/+21 |
* | | | WIP: ShapeShift tx | Frankie | 2016-08-19 | 4 | -4/+198 |
| |/
|/| |
|
* | | Remove ethereum classic provider | Dan Finlay | 2016-08-15 | 2 | -15/+0 |
* | | Add multi message capability to Qr view for market info | Frankie | 2016-08-13 | 2 | -3/+13 |
* | | Add a to test faucet button | Frankie | 2016-08-13 | 1 | -1/+4 |
* | | Merge branch 'master' into buyForm | Frankie | 2016-08-13 | 1 | -1/+1 |
|\ \ |
|
| * | | Add network indicator class to loading image | Dan Finlay | 2016-08-12 | 1 | -1/+1 |
| |/ |
|
* | | Change buy forms so that they are their own view and add Qr-code | Frankie | 2016-08-13 | 4 | -139/+178 |
* | | Even out some of the margins | Frankie | 2016-08-11 | 1 | -2/+4 |
* | | Fix typo for copyButton | Frankie | 2016-08-11 | 1 | -1/+1 |
* | | Merge branch 'master' into buyForm | Frankie | 2016-08-11 | 4 | -10/+37 |
|\| |
|
| * | Fix reference in drop menu item | Dan Finlay | 2016-07-30 | 1 | -2/+3 |
| * | Fix network name reference | Dan Finlay | 2016-07-30 | 1 | -1/+6 |
| * | Add eth classic to provider menu | Dan Finlay | 2016-07-29 | 2 | -8/+27 |
| * | Implement some cross-browser practices (#473) | Dan Finlay | 2016-07-22 | 1 | -1/+2 |
| * | Triage a strange undefined balance error | Dan Finlay | 2016-07-16 | 1 | -1/+2 |
* | | Create "buy form" add shape shift | Frankie | 2016-08-11 | 3 | -0/+595 |
|/ |
|
* | new tx - calculate estimatedGas and show thing in tx-details (#441) | kumavis | 2016-07-14 | 1 | -8/+7 |
* | Fix eth balance tooltip to show 6 decimals (#440) | Frankie | 2016-07-14 | 2 | -2/+3 |
* | Merge branch 'master' into FixSvgIcons | Dan Finlay | 2016-07-12 | 3 | -116/+31 |
|\ |
|
| * | Integrate changes back into eth-balance | Kevin Serrano | 2016-07-12 | 3 | -105/+30 |
| * | Move shorten balance to util. Add as property of generateBalance object output. | Kevin Serrano | 2016-07-12 | 2 | -21/+11 |
* | | Linted | Dan Finlay | 2016-07-12 | 1 | -2/+1 |
* | | Fix imageification of recipient | Dan Finlay | 2016-07-12 | 1 | -3/+4 |
|/ |
|
* | lint | Kevin Serrano | 2016-07-09 | 1 | -5/+5 |
* | Implement alternate shortening scheme. | Kevin Serrano | 2016-07-09 | 2 | -6/+25 |
* | Merge branch 'master' of github.com:MetaMask/metamask-plugin into ui-fixth-wi... | kumavis | 2016-07-08 | 2 | -18/+51 |
|\ |
|
| * | eth-balance fix | kumavis | 2016-07-08 | 1 | -1/+10 |
| * | lint - dingle dangle comma tangle | kumavis | 2016-07-08 | 1 | -1/+1 |
| * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into Confirmatio... | kumavis | 2016-07-08 | 1 | -10/+1 |
| |\ |
|
| * | | notif - add support for forward carrat | kumavis | 2016-07-08 | 1 | -13/+41 |
| * | | ui - remove doubled eth-balance | kumavis | 2016-07-08 | 2 | -5/+1 |
* | | | Resolve merge conflict. | Kevin Serrano | 2016-07-08 | 5 | -60/+308 |
|\ \ \
| | |/
| |/| |
|
| * | | Fixed eth_balance style, completing partial merge | Dan Finlay | 2016-07-08 | 1 | -10/+1 |
| |/ |
|
| * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into Confirmatio... | kumavis | 2016-07-08 | 1 | -1/+2 |
| |\ |
|