Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | | | |||||
| * | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #542 | ||||
* | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | When adding the classic network to the menu, I left a reference to a property that is not always existent, so we needed a fallback for it. | ||||
| * | | | | | 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 |
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add platform specific folders to dist folder * Remove gulp hacks * Add platform specific bundling dev and dist tasks now build into platform-specific folders within the `dist` folder. Added tasks `gulp zip` and `gulp dist`. `zip` builds the platform-specific folders into platform-specific bundles within the `dist` folder. `dist` builds and then zips all at once. * Fix chrome bundle zipping * Fix broken reference in eth warning * Fix but where web3.eth.accounts are not available in firefox. * Bump changelog | ||||
| * / | | | | 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 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * WIP: Buy button link * Add buy eth and the buy eth warning message * Add css * Move the opening of coinbase page to background and send to faucet if on test net * Create a Warning about storeing eth * Finish Buy button and Eth store warning screen * Add to CHANGELOG * fix frankies deletion and change chrome to extension | ||||
| * | | Implement some cross-browser practices (#473) | Dan Finlay | 2016-07-22 | 2 | -4/+6 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | * Add mozilla plugin key to manifest * Move all chrome references into platform-checking module Addresses #453 * Add chrome global back to linter blacklist * Add tests | ||||
| * | Merge branch 'FixReopeningBug' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2016-07-19 | 2 | -1/+10 |
| |\ | | | | | | | | | | FixReopeningBug | ||||
| | * | Add ui state logging function | Dan Finlay | 2016-07-16 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | Now from the UI console, you can always call `logState()`, and it will print the state stringified into the console, ready to drop into the ui dev mode states folder, or other inspection. This should make it easier to diagnose user bugs in the future. | ||||
| | * | 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 ↵ | Kevin Serrano | 2016-07-19 | 1 | -1/+6 |
| |\ \ | | | | | | | | | | | | | AustP-master | ||||
| | * | | 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 |
| | | | | | | * new tx - calculate estimatedGas and show thing in tx-details * Bump changelog | ||||
* | Fix eth balance tooltip to show 6 decimals (#440) | Frankie | 2016-07-14 | 3 | -4/+9 |
| | | | | | | | | | | | | * Fix tooltip to show to the 6 decimal place on balances ovr 0... * Change font size for balance component in tx-list so it fits the notation * Add to change log * Linting * change log | ||||
* | Move fox logo with filled in eyes into design folder (#433) | Frankie | 2016-07-14 | 1 | -0/+0 |
| | | | | | | | | | | * Move fox logo with filled in eyes into design folder * Crop fox * Crop fox properly * Gah Crop fox properly | ||||
* | Merge branch 'master' of github.com:MetaMask/metamask-plugin into FixMenuBug | kumavis | 2016-07-12 | 6 | -145/+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 | 2 | -3/+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 ↵ | kumavis | 2016-07-08 | 2 | -18/+51 |
|\ | | | | | | | ui-fixth-width-tx-history | ||||
| * | 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 ↵ | kumavis | 2016-07-08 | 1 | -10/+1 |
| |\ | | | | | | | | | | ConfirmationStyle | ||||
| * | | 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 | 10 | -69/+361 |
|\ \ \ | | |/ | |/| | |||||
| * | | 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 ↵ | kumavis | 2016-07-08 | 2 | -2/+2 |
| |\ | | | | | | | | | | ConfirmationStyle | ||||
| * | | lint fix | kumavis | 2016-07-08 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵ | kumavis | 2016-07-08 | 2 | -21/+48 |
| |\ \ | | | | | | | | | | | | | ConfirmationStyle | ||||
| * | | | Restore button naming consistency | Dan Finlay | 2016-07-08 | 1 | -2/+2 |
| | | | | |||||
| * | | | Add nickname rendering for recipient address | Dan Finlay | 2016-07-08 | 2 | -5/+19 |
| | | | | |||||
| * | | | 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 | 7 | -18/+210 |
| | | | | | | | | |||||
| * | | | | | | | 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 ↵ | Kevin Serrano | 2016-07-08 | 2 | -1/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed width specifically to this style. | ||||
* | | | | | | | | 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 ↵ | Kevin Serrano | 2016-07-08 | 2 | -2/+3 |
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | history text. | ||||
* | | | | | | 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 |
| |_|_|_|/ |/| | | | | | | | | | | | | | | component | ||||
* | | | | | 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 |
|\ \ | | | | | | | Ui formatting for account details | ||||
| * | | 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 |
| |