Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| * | | | | | Linted | Dan Finlay | 2016-07-29 | 1 | -1/+1 |
| * | | | | | Add missing reference for provider | Dan Finlay | 2016-07-29 | 1 | -1/+1 |
| * | | | | | Fix margin on provider checkmarks | Dan Finlay | 2016-07-29 | 1 | -0/+1 |
| * | | | | | Add eth classic to provider menu | Dan Finlay | 2016-07-29 | 5 | -9/+44 |
| * | | | | | Merge branch 'master' into droppo-fix | Kevin Serrano | 2016-07-27 | 1 | -2/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Add platform specific builds and zip tasks (#486) | Dan Finlay | 2016-07-27 | 1 | -2/+2 |
| | | |_|_|/ | | |/| | | | |||||
| * / | | | | Fix menu droppo issues caused by Chrome 52. | Kevin Serrano | 2016-07-27 | 2 | -0/+2 |
| |/ / / / | |||||
| * | | / | Add mock dev mode | Dan Finlay | 2016-07-22 | 1 | -2/+1 |
| | |_|/ | |/| | | |||||
| * | | | Buy button (#474) | Frankie | 2016-07-22 | 7 | -2/+169 |
| | |/ | |/| | |||||
| * | | Implement some cross-browser practices (#473) | Dan Finlay | 2016-07-22 | 2 | -4/+6 |
| |/ | |||||
| * | Merge branch 'FixReopeningBug' of github.com:MetaMask/metamask-plugin into Fi... | Kevin Serrano | 2016-07-19 | 2 | -1/+10 |
| |\ | |||||
| | * | Add ui state logging function | Dan Finlay | 2016-07-16 | 1 | -0/+8 |
| | * | Triage a strange undefined balance error | Dan Finlay | 2016-07-16 | 1 | -1/+2 |
| * | | Readd string to conform to tests. Will discuss later. | Kevin Serrano | 2016-07-19 | 1 | -1/+1 |
| * | | Remove unused None string. | Kevin Serrano | 2016-07-19 | 1 | -1/+1 |
| * | | Merge branch 'master' of https://github.com/AustP/metamask-plugin into AustP-... | Kevin Serrano | 2016-07-19 | 1 | -1/+6 |
| |\ \ | |||||
| | * | | Add eslint config to pass tests | Aust | 2016-07-19 | 1 | -0/+1 |
| | * | | Make zero balance display 0. Fixes #449 | Aust | 2016-07-18 | 1 | -1/+5 |
| | |/ | |||||
| * / | Fix typo | Thibaut SCHAEFFER | 2016-07-18 | 1 | -1/+1 |
| |/ | |||||
* / | Create "buy form" add shape shift | Frankie | 2016-08-11 | 9 | -6/+933 |
|/ | |||||
* | 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 | 3 | -4/+9 |
* | Merge branch 'master' of github.com:MetaMask/metamask-plugin into FixMenuBug | kumavis | 2016-07-12 | 5 | -144/+64 |
|\ | |||||
| * | Merge branch 'master' into FixSvgIcons | Dan Finlay | 2016-07-12 | 4 | -139/+59 |
| |\ | |||||
| | * | Integrate changes back into eth-balance | Kevin Serrano | 2016-07-12 | 4 | -111/+40 |
| | * | Move shorten balance to util. Add as property of generateBalance object output. | Kevin Serrano | 2016-07-12 | 3 | -23/+28 |
| | * | Remove unused functions. Readd if necessary. | Kevin Serrano | 2016-07-12 | 1 | -18/+4 |
| * | | Linted | Dan Finlay | 2016-07-12 | 1 | -2/+1 |
| * | | Fix imageification of recipient | Dan Finlay | 2016-07-12 | 1 | -3/+4 |
| |/ | |||||
* / | Fix main dropdown animation | Dan Finlay | 2016-07-12 | 1 | -2/+2 |
|/ | |||||
* | 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 | 9 | -69/+330 |
|\ \ \ | | |/ | |/| | |||||
| * | | 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 | 2 | -2/+2 |
| |\ | |||||
| * | | lint fix | kumavis | 2016-07-08 | 1 | -1/+1 |
| * | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into Confirmatio... | kumavis | 2016-07-08 | 2 | -21/+48 |
| |\ \ | |||||
| * | | | Restore button naming consistency | Dan Finlay | 2016-07-08 | 1 | -2/+2 |
| * | | | Add nickname rendering for recipient address | Dan Finlay | 2016-07-08 | 1 | -1/+1 |
| * | | | Linted | Dan Finlay | 2016-07-08 | 2 | -2/+2 |
| * | | | Refined tx confirmation button styles | Dan Finlay | 2016-07-08 | 1 | -7/+19 |
| * | | | Implement tx confirmation style refinements | Dan Finlay | 2016-07-08 | 4 | -24/+38 |
| * | | | Add configurable params to eth-balance | Dan Finlay | 2016-07-08 | 1 | -10/+17 |
| * | | | Make mini account panel labels fully configurable | Dan Finlay | 2016-07-08 | 2 | -28/+42 |
| * | | | Remove formatBalance.formatted references | Dan Finlay | 2016-07-08 | 1 | -4/+4 |
| * | | | Merge branch 'master' into ConfirmationStyle | Dan Finlay | 2016-07-08 | 2 | -40/+28 |
| |\ \ \ | |||||
| * | | | | Correct data length calculation | Dan Finlay | 2016-07-07 | 1 | -1/+1 |
| * | | | | Update gas cost | Dan Finlay | 2016-07-07 | 1 | -1/+1 |
| * | | | | Fix sender balance rendering in pending tx details | Dan Finlay | 2016-07-07 | 1 | -1/+4 |
| * | | | | Merge branch 'master' into ConfirmationStyle | Dan Finlay | 2016-07-07 | 2 | -4/+4 |
| |\ \ \ \ | |||||
| * | | | | | Linted | Dan Finlay | 2016-07-07 | 2 | -29/+6 |
| * | | | | | Fixed up pending-tx-details | Dan Finlay | 2016-07-07 | 3 | -24/+27 |
| * | | | | | Fleshed out pending tx view | Dan Finlay | 2016-07-07 | 4 | -31/+86 |
| * | | | | | Merged latest balance formatting code | Dan Finlay | 2016-07-07 | 4 | -29/+42 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into ConfirmationStyle | Dan Finlay | 2016-07-07 | 2 | -28/+39 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Began reworking tx conf view | Dan Finlay | 2016-07-07 | 6 | -18/+193 |
| * | | | | | | | Simplify empty account balance rendering | Dan Finlay | 2016-07-06 | 1 | -1/+1 |
* | | | | | | | | Pass the linters. | Kevin Serrano | 2016-07-08 | 1 | -5/+5 |
* | | | | | | | | Remove reducer console log. | Kevin Serrano | 2016-07-08 | 1 | -1/+0 |
* | | | | | | | | Add new component for tx-history to avoid messing with other styles. Add fixe... | Kevin Serrano | 2016-07-08 | 2 | -1/+71 |
* | | | | | | | | Modified test views again. Added fixed length to center tx information. | Kevin Serrano | 2016-07-08 | 2 | -1/+5 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Remove logging for states. | Kevin Serrano | 2016-07-08 | 1 | -1/+0 |
* | | | | | | | Add new test state with tx history. Fix alignment issue with transaction hist... | Kevin Serrano | 2016-07-08 | 2 | -2/+3 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Change function name to generateBalanceObject | Frankie | 2016-07-08 | 2 | -4/+4 |
* | | | | | | Add method to deal with small decimals and create the object for eth-balance ... | Frankie | 2016-07-08 | 2 | -17/+34 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Revert back to original formatBalance | Frankie | 2016-07-08 | 2 | -40/+28 |
| |_|_|/ |/| | | | |||||
* | | | | Fix dropdown z-index issue. | Kevin Serrano | 2016-07-07 | 1 | -3/+3 |
* | | | | Handle to small of balances with "<0.00001" | Frankie | 2016-07-07 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Add a postion option for tool tip | Frankie | 2016-07-07 | 2 | -1/+2 |
* | | | Add decimal hendeling to ETH balance | Frankie | 2016-07-07 | 3 | -28/+40 |
| |/ |/| | |||||
* | | Merge pull request #387 from MetaMask/ui-formatting | Dan Finlay | 2016-07-07 | 1 | -23/+25 |
|\ \ | |||||
| * | | Move account balance down a row. Adjusted positioning of buttons. | Kevin Serrano | 2016-07-06 | 1 | -23/+25 |
| |/ | |||||
* / | Add light and ultraLight fonts | Frankie | 2016-07-06 | 2 | -5/+14 |
|/ | |||||
* | Put network status checkmarks at end of row | Dan Finlay | 2016-07-02 | 2 | -0/+5 |
* | Linted | Dan Finlay | 2016-07-02 | 1 | -1/+0 |
* | Move main drop-down state to component state | Dan Finlay | 2016-07-02 | 3 | -35/+9 |
* | Formatted dev mode better | Dan Finlay | 2016-07-01 | 3 | -7/+6 |
* | Added some basic styles | Dan Finlay | 2016-07-01 | 1 | -1/+14 |
* | disclaimer - render via react-markdown | kumavis | 2016-07-01 | 1 | -2/+10 |
* | Remove old disclaimer | Dan Finlay | 2016-07-01 | 1 | -8/+0 |
* | Merge branch 'master' into FrankieDisclaimer | Dan Finlay | 2016-07-01 | 8 | -90/+161 |
|\ | |||||
| * | Merge pull request #378 from MetaMask/UiDev | kumavis | 2016-07-01 | 2 | -1/+11 |
| |\ | |||||
| | * | Make info page not chrome dependent | Dan Finlay | 2016-07-01 | 1 | -1/+7 |
| | * | First simple version of ui mocker | Dan Finlay | 2016-07-01 | 2 | -1/+5 |
| * | | Merge branch 'master' into compactLayout | Frankie | 2016-07-01 | 1 | -0/+5 |
| |\ \ | |||||
| | * | | Fix broken action reference | Dan Finlay | 2016-07-01 | 1 | -0/+5 |
| | |/ | |||||
| * | | Implemt new account layout | Frankie | 2016-07-01 | 6 | -35/+59 |
| * | | WIP: Working on new layout | Frankie | 2016-07-01 | 4 | -82/+114 |
| |/ | |||||
* / | Add new user agreement | Dan Finlay | 2016-07-01 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'master' of github.com:MetaMask/metamask-plugin into networkIndi... | kumavis | 2016-06-30 | 6 | -41/+128 |
|\ | |||||
| * | Unify tooltip styles | Dan Finlay | 2016-06-30 | 4 | -26/+59 |
| * | Merge branch 'master' into CopyTxHash | Dan Finlay | 2016-06-30 | 1 | -3/+3 |
| |\ | |||||
| * | | Add tooltip to copy button | Dan Finlay | 2016-06-30 | 1 | -10/+41 |