Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | change all instances of selectedAddress to selectedAccount. | Kevin Serrano | 2016-11-22 | 8 | -17/+16 |
* | 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 | Dan Finlay | 2016-11-22 | 1 | -7/+8 |
* | | Merge branch 'dev' into i831-AddRopsten-Dev | Dan Finlay | 2016-11-22 | 27 | -500/+6070 |
|\| | |||||
| * | 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 | 13 | -43/+29 |
| * | 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 |
| * | | | | | Linted | Kevin Serrano | 2016-11-01 | 1 | -1/+0 |
| * | | | | | Implement seed word confirmation page. | Kevin Serrano | 2016-11-01 | 5 | -0/+392 |
| * | | | | | Make case condition more consistent. Remove extra action. Fix incorrect displ... | Kevin Serrano | 2016-10-31 | 2 | -2/+3 |
| * | | | | | 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 i3... | Kevin Serrano | 2016-10-29 | 5 | -21/+124 |
| |\ \ \ \ \ | |||||
| | * | | | | | 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 | 1 | -24/+24 |
| * | | | | | | | 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 | 1 | -24/+24 |
| * | | | | | | | | 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 |
* | | | | | | | | | Begin adding Ropsten support | Dan Finlay | 2016-11-22 | 4 | -3/+31 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | 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 |
| | * | 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 |
| | |/ | |||||
| * / | Make seed word confirmation button font smaller | Dan Finlay | 2016-10-05 | 1 | -0/+1 |
| |/ | |||||
* / | 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 | 4 | -29/+11 |
|\ | |||||
| * | 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 | 3 | -3/+0 |
* | | | 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 node-mo... | Frankie | 2016-09-13 | 6 | -45/+47 |
|/ | |||||
* | 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 |
* | 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 |
|/ | |||||
* | Merge branch 'master' into FixLogoLeak | Dan Finlay | 2016-09-09 | 4 | -5/+11 |
|\ | |||||
| * | Merge branch 'master' into i#589pendingTxsIssue | Frankie | 2016-09-09 | 1 | -14/+3 |
| |\ | |||||
| * | | 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 | 3 | -4/+20 |
| * | | | 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 |
| |_|/ |/| | | |||||
* | | | 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 into... | Dan Finlay | 2016-09-09 | 1 | -1/+1 |
| |\ \ | |||||
| | * \ | 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 |
| |_|/ |/| | | |||||
* | | | 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 |
* | 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 | 6 | -14/+53 |
|\ | |||||
| * | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-26 | 3 | -11/+40 |
| |\ | |||||
| | * | 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 |
| | * | Make restore vault form persist | Dan Finlay | 2016-08-26 | 1 | -3/+14 |
| * | | 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 | 5 | -15/+74 |
| |\ \ \ | |||||
| * | | | | 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 |
* | | | | | | 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 | 9 | -29/+92 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | 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 | 5 | -15/+74 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | 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 |
| | * | | | 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 | 2 | -7/+27 |
| | | |_|/ | | |/| | | |||||
| * | | | | 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 b... | Frankie | 2016-08-20 | 3 | -7/+10 |
|/ / / | |||||
* | | | 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 c... | Frankie | 2016-08-15 | 2 | -1/+8 |
| * | | 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 for... | Kevin Serrano | 2016-08-05 | 1 | -0/+3 |
| * | | 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 |
| * | | | | | Add date access throughout the data flow. | Kevin Serrano | 2016-07-22 | 2 | -0/+2 |
| * | | | | | Merge branch 'master' into usd-conversion | Kevin Serrano | 2016-07-22 | 2 | -4/+6 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add data field to pass up parameters up to reducer. | Kevin Serrano | 2016-07-22 | 2 | -1/+11 |
| * | | | | | | Add fiat actions to metamask controllere and actions. | Kevin Serrano | 2016-07-22 | 1 | -0/+14 |
* | | | | | | | WIP: ShapeShift tx | Frankie | 2016-08-19 | 8 | -12/+274 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Remove ethereum classic provider | Dan Finlay | 2016-08-15 | 4 | -26/+1 |
* | | | | | | Add multi message capability to Qr view for market info | Frankie | 2016-08-13 | 4 | -6/+27 |
* | | | | | | Add a to test faucet button | Frankie | 2016-08-13 | 1 | -1/+4 |
* | | | | | | Merge branch 'master' into buyForm | Frankie | 2016-08-13 | 2 | -7/+10 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into CustomRpcLoadingBug | kumavis | 2016-08-12 | 1 | -6/+9 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | UI logging supressed for production. | Kevin Serrano | 2016-08-12 | 2 | -6/+1 |
| | * | | | | | | Create global variable that changes ui logging. | Kevin Serrano | 2016-08-12 | 2 | -6/+11 |
| | * | | | | | | Setting defaults to production. | Kevin Serrano | 2016-08-12 | 1 | -2/+0 |
| | * | | | | | | Cosmetic difference. | Kevin Serrano | 2016-08-12 | 1 | -2/+1 |
| | * | | | | | | Remove stray console.log | Kevin Serrano | 2016-08-12 | 1 | -1/+0 |
| | * | | | | | | Take out unused dependency. | Kevin Serrano | 2016-08-12 | 1 | -3/+1 |
| | * | | | | | | Remove comments. | Kevin Serrano | 2016-08-12 | 1 | -12/+0 |
| | * | | | | | | Merge branch 'master' into logging-fix | Kevin Serrano | 2016-08-12 | 1 | -1/+2 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Lint | Kevin Serrano | 2016-08-12 | 1 | -2/+2 |
| | * | | | | | | | Add ability to hide logging messages in production. | Kevin Serrano | 2016-08-12 | 1 | -5/+26 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | 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 | 9 | -184/+256 |
* | | | | | | | Even out some of the margins | Frankie | 2016-08-11 | 1 | -2/+4 |
* | | | | | | | Fix typo for copyButton | Frankie | 2016-08-11 | 1 | -1/+1 |
* | | | | | | | Fix merge mess | Frankie | 2016-08-11 | 4 | -14/+108 |
* | | | | | | | Merge branch 'master' into buyForm | Frankie | 2016-08-11 | 17 | -21/+177 |
|\| | | | | | | |||||
| * | | | | | | Fix ether warning checkbox. | Kevin Serrano | 2016-08-11 | 1 | -1/+2 |
| |/ / / / / | |||||
| * | | | | | Fix typos with missing apostrophe | Kevin Serrano | 2016-08-05 | 2 | -2/+2 |
| * | | | | | Fix issue with dropdown menu | Frankie | 2016-08-04 | 1 | -0/+1 |
| * | | | | | 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 |