Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix conflicts | brunobar79 | 2018-10-17 | 194 | -1721/+4929 |
|\ | |||||
| * | Decrease click area for AmountMaxButton on send screen | Whymarrh Whitby | 2018-10-16 | 2 | -19/+24 |
| * | add tooltip for view etherscan tx (#5518) | Michael J. Cohen | 2018-10-16 | 1 | -7/+10 |
| * | Add txReceipt data to transaction details (#5513) | Alexander Tseung | 2018-10-16 | 6 | -5/+84 |
| * | Update Zendesk links for new subdomain | Whymarrh Whitby | 2018-10-12 | 4 | -4/+4 |
| * | test - add actions unit tests (#5369) | Thomas Huang | 2018-10-10 | 1 | -4/+8 |
| * | Make all addresses EIP-55 compliant (#5379) | bakaoh | 2018-10-10 | 3 | -8/+14 |
| * | tests - integration - Add Drizzle tests (#5467) | Bruno Barbieri | 2018-10-10 | 1 | -1/+1 |
| * | Fixed lint errors | Santiago Gonzalez Toral | 2018-10-10 | 1 | -11/+11 |
| * | Added account options on home screen | Santiago Gonzalez Toral | 2018-10-10 | 4 | -4/+133 |
| * | Fix token values being undefined | Alexander Tseung | 2018-10-09 | 2 | -3/+8 |
| * | Merge pull request #5442 from whymarrh/fix-page-container-footer | Whymarrh Whitby | 2018-10-06 | 3 | -64/+64 |
| |\ | |||||
| | * | Fix markup for inline instances of `PageContainer`s | Whymarrh Whitby | 2018-10-06 | 3 | -64/+64 |
| * | | Fix action translations edge cases | Alexander Tseung | 2018-10-06 | 4 | -2/+14 |
| |/ | |||||
| * | Merge pull request #5428 from alextsg/i5372-queue-order | Dan Finlay | 2018-10-06 | 1 | -1/+1 |
| |\ | |||||
| | * | Reverse pending transactions order | Alexander Tseung | 2018-10-05 | 1 | -1/+1 |
| * | | Translate method names in the transaction list only when applicable | Alexander Tseung | 2018-10-05 | 6 | -20/+108 |
| |/ | |||||
| * | Remove "Copy Contract Address" from token options | Whymarrh Whitby | 2018-10-04 | 1 | -9/+0 |
| * | Merge pull request #5329 from whymarrh/confirm-features | Whymarrh Whitby | 2018-10-02 | 12 | -25/+245 |
| |\ | |||||
| | * | Only use current network txs when calculating "Reject All" | Whymarrh Whitby | 2018-10-02 | 1 | -1/+6 |
| | * | Switch page-container__footer-* for header and footer tags | Whymarrh Whitby | 2018-10-02 | 3 | -27/+27 |
| | * | Reword batch reject confirm as "Reject All" | Whymarrh Whitby | 2018-10-02 | 1 | -1/+1 |
| | * | Confirm rejecting multiple transactions with modal | Whymarrh Whitby | 2018-10-02 | 7 | -4/+100 |
| | * | s/Cancel/Reject/ on confirm screen for clarity | Whymarrh Whitby | 2018-10-02 | 1 | -1/+2 |
| | * | Add "Cancel All" button to confirm footer | Whymarrh Whitby | 2018-10-02 | 4 | -4/+79 |
| | * | Have PageContainerFooter take children node | Whymarrh Whitby | 2018-10-02 | 3 | -21/+64 |
| * | | Recipient not required on send screen when hex data present | Whymarrh Whitby | 2018-10-01 | 5 | -4/+17 |
| * | | Rework estimateGas logic | Whymarrh Whitby | 2018-10-01 | 1 | -10/+10 |
| * | | Update gas when hex data changes on send screen | Whymarrh Whitby | 2018-10-01 | 9 | -14/+56 |
| * | | Update send.utils.test to with better mocks | Whymarrh Whitby | 2018-10-01 | 1 | -5/+8 |
| * | | Allow sending transactions with hex data and no recipient | Whymarrh Whitby | 2018-10-01 | 1 | -2/+2 |
| |/ | |||||
| * | Improvement: Reposition customize gas error (#5265) | Sean | 2018-10-01 | 1 | -2/+4 |
| * | support editable customRPC (#5267) | HackyMiner | 2018-09-29 | 4 | -0/+34 |
| * | Close transaction details modal when clicking speed up | Alexander Tseung | 2018-09-27 | 2 | -4/+10 |
| * | Merge pull request #5332 from MetaMask/ui-unit-tests | Thomas Huang | 2018-09-26 | 7 | -0/+488 |
| |\ | |||||
| | * | Some Ui tests | tmashuang | 2018-09-25 | 7 | -0/+488 |
| * | | Merge pull request #5282 from MetaMask/tx-cancel-ui | Alexander Tseung | 2018-09-25 | 66 | -369/+1196 |
| |\ \ | | |/ | |/| | |||||
| | * | Fix multiplyCurrencies. Add onClose prop for Modal component. Remove hideModa... | Alexander Tseung | 2018-09-21 | 9 | -57/+40 |
| | * | Add unit tests | Alexander Tseung | 2018-09-20 | 9 | -15/+342 |
| | * | Fix unit tests | Alexander Tseung | 2018-09-20 | 1 | -5/+4 |
| | * | Add transition effect to TransactionListItemDetails expander | Alexander Tseung | 2018-09-20 | 2 | -13/+29 |
| | * | Add TransactionDetails modal | Alexander Tseung | 2018-09-20 | 9 | -9/+122 |
| | * | Switch existing modals from using Notification to Modal. Remove Notification ... | Alexander Tseung | 2018-09-20 | 36 | -321/+500 |
| | * | Add withModalProps HOC | Alexander Tseung | 2018-09-20 | 2 | -0/+22 |
| | * | Fix Transaction view styles | Alexander Tseung | 2018-09-20 | 3 | -3/+9 |
| | * | Add Modal component | Alexander Tseung | 2018-09-20 | 7 | -0/+186 |
| | * | Refactor ConfirmPageContainerError to ErrorMessage | Alexander Tseung | 2018-09-20 | 8 | -18/+14 |
| * | | Merge pull request #5241 from MetaMask/refactor-settings | Alexander Tseung | 2018-09-21 | 16 | -809/+801 |
| |\ \ | |||||
| | * | | Fix translation casing | Alexander Tseung | 2018-09-21 | 1 | -4/+0 |
| | * | | Add Current Conversion Updated string to translations | Alexander Tseung | 2018-09-20 | 1 | -1/+1 |
| | * | | Refactor settings page to use JSX and follow component file folder structure | Alexander Tseung | 2018-09-20 | 16 | -809/+805 |
| | |/ | |||||
| * | | Move main-container wrapper div into its own class | Whymarrh Whitby | 2018-09-20 | 4 | -2/+13 |
| * | | Prevent loading screen from overlaying the app bar | Whymarrh Whitby | 2018-09-20 | 3 | -7/+11 |
| * | | Make the LoadingScreen component 100% as tall as its container | Whymarrh Whitby | 2018-09-20 | 1 | -10/+1 |
| * | | Remove unused loading-overlay--full-screen CSS styles | Whymarrh Whitby | 2018-09-20 | 1 | -7/+0 |
| |/ | |||||
| * | Fix exception thrown on getTokenData | Alexander Tseung | 2018-09-19 | 2 | -2/+24 |
| * | Merge branch 'develop' into eip-712 | Paul Bouchon | 2018-09-18 | 7 | -18/+54 |
| |\ | |||||
| | * | compute and display checksummed hash in selected-account component (#5255) | Chad Grimaldi | 2018-09-16 | 2 | -3/+20 |
| | * | Improvement: Increase click area for arrows (#5264) | Sean | 2018-09-16 | 2 | -6/+18 |
| | * | Fix speed up functionality | Alexander Tseung | 2018-09-15 | 2 | -5/+12 |
| | * | Merge pull request #5261 from lastblocklabs/style-fix-5242 | Whymarrh Whitby | 2018-09-15 | 1 | -3/+3 |
| | |\ | |||||
| | | * | follow up style fix to #5242 | chadmg | 2018-09-14 | 1 | -3/+3 |
| | * | | Bug Fix: #5183 history not defined | Sean Rabaut | 2018-09-14 | 1 | -1/+1 |
| | |/ | |||||
| * | | Update new method namespace from v2 to v3 | bitpshr | 2018-09-14 | 1 | -3/+3 |
| * | | Implement latest EIP-712 protocol | bitpshr | 2018-09-14 | 2 | -7/+42 |
| |/ | |||||
| * | Merge pull request #5182 from MetaMask/tx-activity | Alexander Tseung | 2018-09-13 | 62 | -314/+1400 |
| |\ | |||||
| | * | Fix identicon address. Fix styling of New Contract recipient. Fix Activity Lo... | Alexander Tseung | 2018-09-13 | 8 | -13/+39 |
| | * | Fix tests. Add className to Identicon ethLogos. | Alexander Tseung | 2018-09-13 | 1 | -0/+1 |
| | * | Add WEI to getEthConversionFromWeiHex | Alexander Tseung | 2018-09-13 | 1 | -1/+1 |
| | * | Add transaction details to TransactionListItem component | Alexander Tseung | 2018-09-13 | 3 | -37/+46 |
| | * | Add TransactionListItemDetails component | Alexander Tseung | 2018-09-13 | 5 | -0/+200 |
| | * | Add TransactionBreakdown component | Alexander Tseung | 2018-09-13 | 9 | -0/+240 |
| | * | Add tests for TransactionActivityLog. Make changes to rendering events | Alexander Tseung | 2018-09-13 | 9 | -42/+325 |
| | * | Edit styling of cards variant of SenderToRecipient component | Alexander Tseung | 2018-09-13 | 1 | -1/+1 |
| | * | Add HexToDecimal component | Alexander Tseung | 2018-09-13 | 4 | -161/+48 |
| | * | Add tests for Card component | Alexander Tseung | 2018-09-13 | 2 | -1/+26 |
| | * | Allow denominations in CurrencyDisplay component | Alexander Tseung | 2018-09-13 | 6 | -16/+85 |
| | * | Add raised type buttons to Button component. Refactor all buttons within app ... | Alexander Tseung | 2018-09-13 | 18 | -94/+180 |
| | * | Add ActivityLog component | Alexander Tseung | 2018-09-13 | 9 | -1/+261 |
| * | | increase z-index of send-to input to allow for right-click (#5242) | Chad Grimaldi | 2018-09-13 | 1 | -0/+4 |
| |/ | |||||
| * | Merge pull request #5216 from MetaMask/tx-cancel | Frankie | 2018-09-11 | 1 | -0/+25 |
| |\ | |||||
| | * | Add createCancelTransaction method | Alexander Tseung | 2018-09-11 | 1 | -0/+25 |
| * | | Merge pull request #5223 from whymarrh/tx-error-tooltips | Frankie | 2018-09-11 | 5 | -31/+77 |
| |\ \ | |||||
| | * | | Show failed tx txMeta.err in tooltips | Whymarrh Whitby | 2018-09-09 | 1 | -1/+1 |
| | * | | Show failed tx RPC error messages in tooltips | Whymarrh Whitby | 2018-09-09 | 2 | -2/+15 |
| | * | | Don't render tooltips without titles | Whymarrh Whitby | 2018-09-09 | 1 | -0/+8 |
| | * | | Rewrite Tooltip component as ES6 | Whymarrh Whitby | 2018-09-09 | 3 | -30/+55 |
| | |/ | |||||
| * / | Clear old seed words when importing new seed words | Whymarrh Whitby | 2018-09-11 | 1 | -2/+8 |
| |/ | |||||
* | | fix merge conflicts | brunobar79 | 2018-09-11 | 1 | -1/+1 |
|\| | |||||
| * | Use correct loading message when connecting to Kovan (#5189) | Eugene Marinelli | 2018-09-06 | 1 | -1/+1 |
* | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 | brunobar79 | 2018-09-06 | 131 | -2288/+3055 |
|\| | |||||
| * | Fix assertion of missing child component | Whymarrh Whitby | 2018-09-06 | 1 | -1/+1 |
| * | Merge pull request #5188 from taobun/develop | Dan J Miller | 2018-09-05 | 1 | -1/+1 |
| |\ | |||||
| | * | fix check valid decimals code in new ui | bunoi | 2018-09-05 | 1 | -1/+1 |
| * | | Merge pull request #5167 from MetaMask/fix-watcAsset-images | Dan Finlay | 2018-09-05 | 13 | -11/+51 |
| |\ \ | |||||
| | * | | balance components using selectors | Esteban MIno | 2018-08-31 | 2 | -5/+5 |
| | * | | fix integration test for asset images selectors | Esteban MIno | 2018-08-31 | 1 | -2/+2 |
| | * | | fix watched tokens images showing in tx list | Esteban MIno | 2018-08-31 | 4 | -4/+16 |
| | * | | fix watched asset image rendering on confirm transaction header | Esteban MIno | 2018-08-30 | 2 | -1/+5 |
| | * | | fix images for watched tokens | Esteban MIno | 2018-08-30 | 8 | -4/+28 |
| | |/ | |||||
| * | | Merge pull request #5129 from MetaMask/add-sidebar-component | Dan J Miller | 2018-09-05 | 14 | -76/+258 |
| |\ \ | |||||
| | * | | Adds sidebar component and refactors slide in wallet view sidebar to use it. | Dan Miller | 2018-08-29 | 14 | -76/+258 |
| * | | | Merge pull request #5091 from MetaMask/i4945-feature-flag-hex-data | Dan J Miller | 2018-09-04 | 10 | -4/+71 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Adds feature flag toggle for the hex data row on the send screen. | Dan Miller | 2018-08-27 | 10 | -4/+71 |
| * | | | Merge pull request #5155 from MetaMask/i5154-confirm-spinner | Alexander Tseung | 2018-08-29 | 4 | -7/+20 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Fix infinite spinner on failed transactions | Alexander Tseung | 2018-08-29 | 4 | -7/+20 |
| * | | | fix conflicts | Esteban MIno | 2018-08-29 | 99 | -2166/+2404 |
| |\| | | |||||
| | * | | Merge pull request #5121 from MetaMask/i5099-approve | Alexander Tseung | 2018-08-28 | 1 | -29/+87 |
| | |\ \ | |||||
| | | * | | Use eth-contract-metadata data if the token symbol or decimals fail on retrieval | Alexander Tseung | 2018-08-23 | 1 | -29/+87 |
| | * | | | Fix tests | Alexander Tseung | 2018-08-24 | 1 | -2/+12 |
| | * | | | Fix naming, add eth.getCode check for actions, fix translations for statuses | Alexander Tseung | 2018-08-24 | 22 | -96/+81 |
| | * | | | Change "Outgoing" to "Sent Ether" or "Sent Token" | Alexander Tseung | 2018-08-24 | 2 | -4/+4 |
| | * | | | Add CurrencyDisplay and TokenCurrencyDisplay components | Alexander Tseung | 2018-08-24 | 14 | -74/+425 |
| | * | | | Update retry transaction logic to use network nonce | Alexander Tseung | 2018-08-24 | 3 | -12/+46 |
| | * | | | Fix e2e tests | Alexander Tseung | 2018-08-24 | 6 | -33/+30 |
| | * | | | Fix integration tests | Alexander Tseung | 2018-08-24 | 7 | -5/+24 |
| | * | | | Fix e2e tests | Alexander Tseung | 2018-08-24 | 1 | -1/+1 |
| | * | | | Fix shapeshift transactions. Delete unused files | Alexander Tseung | 2018-08-24 | 9 | -689/+34 |
| | * | | | Show token amounts in TransactionListItem for token transfers | Alexander Tseung | 2018-08-24 | 10 | -79/+75 |
| | * | | | Add retry button to TransactionListItem | Alexander Tseung | 2018-08-24 | 11 | -50/+175 |
| | * | | | Code cleanup | Alexander Tseung | 2018-08-24 | 2 | -30/+14 |
| | * | | | Use css grid for TransactionListItem for responsive layout | Alexander Tseung | 2018-08-24 | 8 | -66/+88 |
| | * | | | Add tOrKey function to I18nProvider | Alexander Tseung | 2018-08-24 | 1 | -2/+9 |
| | * | | | Refactor transactions list views. Add redesign components | Alexander Tseung | 2018-08-24 | 39 | -380/+926 |
| | * | | | Delete unused files | Alexander Tseung | 2018-08-24 | 3 | -189/+0 |
| | * | | | Add withMethodData HOC, add higher-order-component folder | Alexander Tseung | 2018-08-24 | 10 | -25/+75 |
| | * | | | Add TransactionStatus component | Alexander Tseung | 2018-08-24 | 3 | -0/+67 |
| | * | | | Add MenuBar component | Alexander Tseung | 2018-08-24 | 4 | -0/+97 |
| | * | | | Add react-media package to prevent rendering wallet-view twice in the popup view | Alexander Tseung | 2018-08-24 | 1 | -1/+5 |
| | * | | | Refactor home screen and remove unused files | Alexander Tseung | 2018-08-24 | 10 | -620/+116 |
| | | |/ | | |/| | |||||
| | * | | updated docs, small improvement of recent RPC rendering | Evgeniy Filatov | 2018-08-23 | 1 | -2/+3 |
| | * | | backported RPC improvements to oldui | Evgeniy Filatov | 2018-08-23 | 1 | -2/+1 |
| | * | | implemented improvements to RPC history | Evgeniy Filatov | 2018-08-23 | 1 | -4/+6 |
| | |/ | |||||
| | * | Merge pull request #5089 from MetaMask/i5085-ethcode | Alexander Tseung | 2018-08-23 | 5 | -37/+99 |
| | |\ | |||||
| | | * | Use eth_getCode to sort transaction action type | Alexander Tseung | 2018-08-23 | 5 | -37/+99 |
| | * | | Fix code readability, use PureComponent over Component | Alexander Tseung | 2018-08-23 | 3 | -33/+23 |
| | * | | Add tabs support for PageContainer | Alexander Tseung | 2018-08-23 | 5 | -83/+132 |
| | |/ | |||||
| | * | Merge pull request #5102 from whymarrh/fix-account-export-pw-bug | Whymarrh Whitby | 2018-08-23 | 2 | -5/+20 |
| | |\ | |||||
| | | * | Clear warnings when exportAccount succeeds | Whymarrh Whitby | 2018-08-23 | 1 | -4/+19 |
| | | * | Handle case where keyring is missing in AccountDetailsModal | Whymarrh Whitby | 2018-08-23 | 1 | -1/+1 |
| | * | | Merge pull request #5066 from whymarrh/fix-key-export | Whymarrh Whitby | 2018-08-23 | 2 | -10/+19 |
| | |\ \ | |||||
| | | * | | Don't re-render the export modal when the selected identity changes | Whymarrh Whitby | 2018-08-23 | 1 | -8/+17 |
| | | * | | Update AccountModalContainer to accept a selectedIdentity prop | Whymarrh Whitby | 2018-08-23 | 1 | -2/+2 |
| | | |/ | |||||
| | * / | Add new variant for SenderToRecipient component | Alexander Tseung | 2018-08-23 | 5 | -96/+199 |
| | |/ | |||||
| * | | typo watchAsset imageUrl to image | Esteban MIno | 2018-08-24 | 8 | -15/+15 |
| * | | fix integration tests on balance component with new watchAsset | Esteban MIno | 2018-08-22 | 1 | -3/+3 |
| * | | unit tests for watchAsset | Esteban MIno | 2018-08-22 | 1 | -2/+0 |
| * | | refactor watchToken related functions | Esteban MIno | 2018-08-21 | 3 | -9/+9 |
| * | | Merge branch 'develop' into WatchTokenFeature | Esteban MIno | 2018-08-21 | 40 | -155/+920 |
| |\| | |||||
| * | | delete according image when token added with watchToken deleted | Esteban MIno | 2018-08-17 | 3 | -9/+9 |
| * | | correct behavior when notification is closed when popup | Esteban MIno | 2018-08-17 | 4 | -16/+23 |
| * | | WIP | Esteban MIno | 2018-08-17 | 3 | -3/+10 |
| * | | show watch asset image from hide token modal | Esteban MIno | 2018-08-16 | 2 | -12/+14 |
| * | | add suggested tokens objects in metamask state | Esteban MIno | 2018-08-16 | 2 | -5/+4 |
| * | | add support for images base64 and urls on new ui | Esteban MIno | 2018-08-15 | 7 | -42/+63 |
| * | | refactor unused code | Esteban MIno | 2018-08-08 | 4 | -15/+8 |
| * | | Merge branch 'develop' into WatchTokenFeature | Esteban MiƱo | 2018-08-08 | 7 | -16/+27 |
| |\ \ | |||||
| * | | | watch token on old ui | Esteban MIno | 2018-08-08 | 2 | -0/+18 |
| * | | | clean confirm add token component | Esteban MIno | 2018-08-07 | 2 | -6/+2 |
| * | | | new confirm add suggested token component | Esteban MIno | 2018-08-07 | 7 | -12/+161 |
| * | | | fix duplicated action | Esteban MIno | 2018-08-07 | 1 | -6/+0 |
| * | | | eth_watchToken working | Esteban MIno | 2018-08-04 | 4 | -3/+34 |
| * | | | popup initializing with suggested tokens | Esteban MIno | 2018-08-04 | 1 | -6/+2 |
| * | | | rpc-engine not crashing when eth_watchToken | Esteban MIno | 2018-08-04 | 1 | -4/+0 |
| * | | | merge develop | Esteban MIno | 2018-08-04 | 296 | -3213/+7863 |
| |\ \ \ | |||||
| * | | | | Linted | Dan Finlay | 2018-06-19 | 1 | -0/+1 |
| * | | | | Begin letting UI show suggested tokens | Dan Finlay | 2018-06-19 | 2 | -2/+13 |
* | | | | | fix comment | brunobar79 | 2018-08-21 | 1 | -2/+0 |
* | | | | | fix merge conflicts | brunobar79 | 2018-08-21 | 35 | -144/+850 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Update logo wordmark | Alexander Tseung | 2018-08-19 | 6 | -56/+28 |
| * | | | | fix ledger affiliate link | brunobar79 | 2018-08-17 | 1 | -1/+1 |
| * | | | | ui ready | brunobar79 | 2018-08-17 | 3 | -9/+37 |
| * | | | | connect screen ready | brunobar79 | 2018-08-17 | 2 | -27/+124 |
| * | | | | Merge branch 'develop' into ledger-support | Bruno Barbieri | 2018-08-15 | 4 | -6/+6 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge pull request #5060 from MetaMask/bignumber-string | Dan Finlay | 2018-08-15 | 3 | -4/+4 |
| | |\ \ \ \ | |||||
| | | * | | | | Cast arguments for new Bignumbers() to string. | Dan Miller | 2018-08-15 | 3 | -4/+4 |
| | * | | | | | Add exportAsFile optional type argument | Whymarrh Whitby | 2018-08-14 | 1 | -2/+2 |
| | |/ / / / | |||||
| * | | | | | remove console logs | brunobar79 | 2018-08-15 | 1 | -1/+1 |
| * | | | | | more ui | brunobar79 | 2018-08-15 | 1 | -1/+2 |
| * | | | | | fix | brunobar79 | 2018-08-15 | 1 | -1/+1 |
| * | | | | | ui fixes | brunobar79 | 2018-08-15 | 4 | -23/+38 |
| * | | | | | fix tx tests | brunobar79 | 2018-08-14 | 1 | -1/+2 |
| * | | | | | legacy and new hd path working | brunobar79 | 2018-08-14 | 3 | -24/+45 |
| * | | | | | good progress adding paths | brunobar79 | 2018-08-14 | 5 | -22/+121 |
| * | | | | | message signing works | brunobar79 | 2018-08-12 | 1 | -0/+1 |
| * | | | | | rename keyring | brunobar79 | 2018-08-11 | 1 | -0/+1 |
| * | | | | | able to add accounts | brunobar79 | 2018-08-11 | 2 | -3/+3 |
| * | | | | | iframe communication working | brunobar79 | 2018-08-11 | 1 | -1/+0 |
| * | | | | | refactor to support multiple hw wallets | brunobar79 | 2018-08-11 | 4 | -27/+43 |
| |/ / / / | |||||
| * | | | | Merge pull request #4897 from MetaMask/qr-code-scan | Bruno Barbieri | 2018-08-11 | 17 | -6/+474 |
| |\ \ \ \ | |||||
| | * | | | | add comment | brunobar79 | 2018-08-09 | 1 | -0/+5 |
| | * | | | | fix merge conflicts | brunobar79 | 2018-08-09 | 1 | -2/+8 |
| | |\ \ \ \ | |||||
| | * | | | | | add submit button type | brunobar79 | 2018-08-09 | 1 | -0/+1 |
| | * | | | | | lint | brunobar79 | 2018-08-08 | 1 | -1/+1 |
| | * | | | | | code review changes | brunobar79 | 2018-08-08 | 1 | -8/+17 |
| | * | | | | | fix merge conflicts | brunobar79 | 2018-08-08 | 8 | -17/+28 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | restore qr | brunobar79 | 2018-08-04 | 1 | -0/+2 |
| | * | | | | | | lint | brunobar79 | 2018-08-04 | 1 | -1/+1 |
| | * | | | | | | fixed issue with input | brunobar79 | 2018-08-04 | 3 | -2/+6 |
| | * | | | | | | clear qr code data before scanning | brunobar79 | 2018-08-04 | 1 | -0/+3 |
| | * | | | | | | design complete | brunobar79 | 2018-08-04 | 5 | -21/+117 |
| | * | | | | | | fix | brunobar79 | 2018-08-01 | 1 | -1/+6 |
| | * | | | | | | lint | brunobar79 | 2018-08-01 | 1 | -2/+0 |
| | * | | | | | | added crossbrowser support and error handling | brunobar79 | 2018-08-01 | 6 | -49/+112 |
| | * | | | | | | send to fullscreen if no permission from popup | brunobar79 | 2018-07-31 | 2 | -11/+32 |
| | * | | | | | | kill camera stream when unmouting | brunobar79 | 2018-07-31 | 1 | -1/+4 |
| | * | | | | | | copy | brunobar79 | 2018-07-31 | 1 | -1/+1 |
| | * | | | | | | clean up css | brunobar79 | 2018-07-31 | 3 | -30/+58 |
| | * | | | | | | use existing modals | brunobar79 | 2018-07-31 | 10 | -234/+164 |
| | * | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into qr-code... | brunobar79 | 2018-07-31 | 4 | -6/+30 |
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||||
| | * | | | | | | fix unit tests | brunobar79 | 2018-07-27 | 1 | -0/+2 |
| | * | | | | | | fix dependencies | brunobar79 | 2018-07-27 | 1 | -1/+1 |
| | * | | | | | | fix linting errors | brunobar79 | 2018-07-27 | 2 | -2/+2 |
| | * | | | | | | clean up | brunobar79 | 2018-07-27 | 1 | -1/+0 |
| | * | | | | | | fix merge conflicts | brunobar79 | 2018-07-27 | 12 | -17/+426 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | added webrtc-adapter for browser compat | brunobar79 | 2018-07-27 | 1 | -0/+1 |
| | * | | | | | | | fully working without tweaking ext. permission | brunobar79 | 2018-07-27 | 4 | -3/+4 |
| | * | | | | | | | working without permission issues | brunobar79 | 2018-07-27 | 1 | -36/+44 |
| | * | | | | | | | fix spinner and qr icon | brunobar79 | 2018-07-25 | 2 | -2/+6 |
| | * | | | | | | | decent UI | brunobar79 | 2018-07-25 | 1 | -21/+43 |
| | * | | | | | | | working without injection | brunobar79 | 2018-07-25 | 9 | -21/+229 |
| | * | | | | | | | added qr code scanner icon in send transaction | brunobar79 | 2018-07-24 | 7 | -5/+25 |
| | * | | | | | | | camera working back and forth | brunobar79 | 2018-07-24 | 4 | -1/+36 |
* | | | | | | | | | add error messages | brunobar79 | 2018-08-11 | 1 | -2/+4 |
* | | | | | | | | | hide export private key for trezor accounts | brunobar79 | 2018-08-10 | 1 | -2/+16 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #5000 from MetaMask/contract-method-conf-sim-failure | Dan J Miller | 2018-08-09 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Show error while allowing confirmation of transaction where simulation fails | Dan Miller | 2018-08-09 | 2 | -2/+2 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Fix lint error in tx-list | Whymarrh Whitby | 2018-08-09 | 1 | -1/+1 |
* | | | | | | | | Get nonce for showing retry button using ethQuery transaction count. | Dan Miller | 2018-08-09 | 4 | -6/+46 |
|/ / / / / / / | |||||
* | | | / / / | Use token decimals when calculating confirm screen amount for token approvals. | Dan Miller | 2018-08-08 | 1 | -2/+8 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Fixing translations in first-time init menu (#4969) | Justin Kat | 2018-08-08 | 1 | -1/+1 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge branch 'develop' into TokensPerAccountBasis | Esteban MIno | 2018-08-08 | 10 | -21/+55 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge pull request #4948 from MetaMask/i4638-update-font | Alexander Tseung | 2018-08-04 | 3 | -5/+0 |
| |\ \ \ \ \ | |||||
| | * | | | | | Update Font in Account Selector | Alexander Tseung | 2018-08-04 | 3 | -5/+0 |
| * | | | | | | Disable Confirm button on subsequent clicks to prevent confirming multiple times | Alexander Tseung | 2018-08-04 | 2 | -6/+21 |
| |/ / / / / | |||||
| * | | / / | Show the retry button on latest tx of earliest nonce. | Dan Miller | 2018-08-01 | 1 | -4/+4 |
| | |_|/ / | |/| | | | |||||
| * | | | | Round large exponential numbers | Alexander Tseung | 2018-07-28 | 3 | -6/+23 |
| * | | | | Fix overflow for long total strings in confirm string | Alexander Tseung | 2018-07-26 | 1 | -0/+7 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'develop' into TokensPerAccountBasis | Esteban MiƱo | 2018-07-28 | 8 | -1/+322 |
|\| | | | |||||
| * | | | Merge pull request #4885 from MetaMask/RetryOnEarliestPendingTx | Dan J Miller | 2018-07-26 | 1 | -1/+10 |
| |\ \ \ | |||||
| | * | | | earliest tx by submittedTime | Esteban MIno | 2018-07-26 | 1 | -5/+8 |
| | * | | | only show retry button on earliest pending tx | Esteban MIno | 2018-07-26 | 1 | -1/+7 |
| * | | | | lint fix | Sara Reynolds | 2018-07-26 | 1 | -2/+2 |
| * | | | | Update prop names | Sara Reynolds | 2018-07-26 | 1 | -7/+7 |
| * | | | | Add tests for Confirm Detail Row | Sara Reynolds | 2018-07-26 | 1 | -0/+64 |
| * | | | | Merge pull request #4845 from MetaMask/button-group | Dan J Miller | 2018-07-25 | 6 | -0/+248 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Adds tests for button group component. | Dan Miller | 2018-07-24 | 1 | -0/+97 |
| | * | | | Add ButtonGroup component | Alexander Tseung | 2018-07-24 | 5 | -0/+151 |
* | | | | | add & delete tokens per network | Esteban MIno | 2018-07-27 | 1 | -1/+2 |
|/ / / / | |||||
* | | | | Add close window support to signature requests. Move logic to actions | Alexander Tseung | 2018-07-24 | 5 | -31/+108 |