Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | added new global alert | brunobar79 | 2018-07-19 | 6 | -8/+126 |
| | |||||
* | fix support link | brunobar79 | 2018-07-19 | 1 | -1/+1 |
| | |||||
* | fix unsupported browser view | brunobar79 | 2018-07-19 | 2 | -2/+6 |
| | |||||
* | lint | brunobar79 | 2018-07-19 | 1 | -1/+1 |
| | |||||
* | scroll smooth | brunobar79 | 2018-07-19 | 2 | -3/+12 |
| | |||||
* | design done | brunobar79 | 2018-07-19 | 7 | -48/+385 |
| | |||||
* | fix browser not supported screen | brunobar79 | 2018-07-18 | 3 | -3/+3 |
| | |||||
* | added some e2e tests | brunobar79 | 2018-07-18 | 2 | -1/+48 |
| | |||||
* | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-18 | 5 | -33/+47 |
|\ | | | | | | | initial-trezor-support | ||||
| * | Merge pull request #4815 from MetaMask/i4783-retry | Alexander Tseung | 2018-07-18 | 3 | -22/+16 |
| |\ | | | | | | | Increase clickable area and padding of Retry Transaction bar | ||||
| | * | Increase clickable area and padding of Retry Transaction bar | Alexander Tseung | 2018-07-17 | 3 | -22/+16 |
| | | | |||||
| * | | Merge pull request #4777 from MetaMask/i4661-currencyConversionBug | Whymarrh Whitby | 2018-07-18 | 2 | -11/+31 |
| |\ \ | | |/ | |/| | Fixes conversion status for tokens without conversion rates (#4661) | ||||
| | * | lint fix | Sara Reynolds | 2018-07-17 | 1 | -6/+4 |
| | | | |||||
| | * | Fix edge cases and add translation compatibility | Sara Reynolds | 2018-07-17 | 2 | -6/+15 |
| | | | |||||
| | * | Update onlyRenderConversions function to method and account for edge cases | Sara Reynolds | 2018-07-17 | 1 | -26/+24 |
| | | | |||||
| | * | Fixes conversion status for tokens without conversion rates | Sara Reynolds | 2018-07-17 | 1 | -14/+29 |
| |/ | |||||
* | | updated account list based on new designs | brunobar79 | 2018-07-18 | 5 | -25/+91 |
| | | |||||
* | | added tests for removeAccount | brunobar79 | 2018-07-17 | 2 | -2/+33 |
| | | |||||
* | | added more unit tests | brunobar79 | 2018-07-17 | 2 | -6/+58 |
| | | |||||
* | | added unit tests for metamaskcontroller | brunobar79 | 2018-07-17 | 2 | -3/+87 |
| | | |||||
* | | added test for preferences controller | brunobar79 | 2018-07-17 | 2 | -1/+26 |
| | | |||||
* | | use latest keyring packages | brunobar79 | 2018-07-17 | 2 | -32/+97 |
| | | |||||
* | | restore circleci config | brunobar79 | 2018-07-17 | 1 | -1/+6 |
| | | |||||
* | | Merge branch 'develop' into initial-trezor-support | brunobar79 | 2018-07-17 | 134 | -121/+256 |
|\| | |||||
| * | Merge pull request #4621 from MetaMask/one-send-directory | Whymarrh Whitby | 2018-07-17 | 129 | -55/+173 |
| |\ | | | | | | | Remove 'send_/' directory; revert to just having send | ||||
| | * | Fix send import paths in confirm tx components | Whymarrh Whitby | 2018-07-16 | 2 | -3/+3 |
| | | | |||||
| | * | Fix send import path in customize gas modal | Whymarrh Whitby | 2018-07-16 | 1 | -1/+1 |
| | | | |||||
| | * | Fix send import path in ToAutoComplete | Whymarrh Whitby | 2018-07-16 | 1 | -1/+1 |
| | | | |||||
| | * | Fix lint warnings in the send/ directory. | Dan | 2018-07-16 | 4 | -32/+28 |
| | | | |||||
| | * | Remove send_ directory, revert to just having send | Dan | 2018-07-16 | 124 | -20/+142 |
| | | | | | | | | | | | | | | | | | | Revert accidentally changed constants. Require defaults in ens-input, gas-fee-display and confirm screens. | ||||
| * | | Merge pull request #4636 from MetaMask/bmd/tos-link | Whymarrh Whitby | 2018-07-16 | 5 | -6/+5 |
| |\ \ | | |/ | |/| | fix tos link | ||||
| | * | fix tos link; | Bobby Dresser | 2018-07-13 | 5 | -6/+5 |
| | | | |||||
| * | | Merge pull request #4715 from BitGuildPlatform/to-autocomplete | Dan J Miller | 2018-07-14 | 3 | -121/+142 |
| |\ \ | | | | | | | | | fixes #4664 | ||||
| | * | | fix classname | TrejGun | 2018-07-05 | 1 | -1/+4 |
| | | | | |||||
| | * | | Merge branch 'develop' into to-autocomplete | Анна | 2018-07-05 | 157 | -33248/+33516 |
| | |\ \ | |||||
| | * | | | fixes #4664 | trejgun | 2018-07-03 | 3 | -121/+139 |
| | | | | | |||||
| * | | | | Merge pull request #4702 from BitGuildPlatform/contextTypes | Dan J Miller | 2018-07-14 | 14 | -60/+57 |
| |\ \ \ \ | | | | | | | | | | | | | convert contextType to static prop for refactored components | ||||
| | * \ \ \ | Merge branch 'develop' into contextTypes | TrejGun | 2018-07-05 | 157 | -33248/+33516 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | # Conflicts: # ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js | ||||
| | * | | | | convert contextType to static prop for refactored components | trejgun | 2018-07-05 | 14 | -60/+57 |
| | | |/ / | | |/| | | |||||
* | | | | | clear circleci cache | brunobar79 | 2018-07-14 | 1 | -5/+0 |
| | | | | | |||||
* | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-14 | 8 | -67/+49 |
|\| | | | | | | | | | | | | | | | | | | | initial-trezor-support | ||||
| * | | | | Merge pull request #4787 from MetaMask/stop-inject-harbourair | Thomas Huang | 2018-07-13 | 1 | -0/+1 |
| |\ \ \ \ | | |_|_|/ | |/| | | | Add harbourair.com to injection block list | ||||
| | * | | | Add harbourair.com to injection block list | Dan Finlay | 2018-07-13 | 1 | -0/+1 |
| |/ / / | | | | | | | | | | | | | | | | | This site was getting unexpected results when MetaMask was installed. https://consensys.zendesk.com/agent/tickets/2312 | ||||
| * | | | Merge pull request #4669 from MetaMask/removeNonceTrackerFunction | Thomas Huang | 2018-07-13 | 1 | -13/+0 |
| |\ \ \ | | | | | | | | | | | Remove unsued nonce tracker function | ||||
| | * \ \ | Merge branch 'develop' into removeNonceTrackerFunction | Thomas | 2018-07-11 | 214 | -33189/+34938 |
| | |\ \ \ | |||||
| | * | | | | Remove unsued nonce tracker function | tmashuang | 2018-06-26 | 1 | -13/+0 |
| | | | | | | |||||
| * | | | | | Merge pull request #4766 from whymarrh/null-translations | Whymarrh Whitby | 2018-07-13 | 4 | -41/+18 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Rework i18n-helper getMessage function | ||||
| | * | | | | | Remove unneeded MetaMaskConnect connect wrapper | Whymarrh Whitby | 2018-07-12 | 2 | -28/+1 |
| | | | | | | | |||||
| | * | | | | | Fallback to English and then the key for I18nProvider#t | Whymarrh Whitby | 2018-07-12 | 2 | -11/+16 |
| | | | | | | | |||||
| | * | | | | | Inline locale variable in fetchLocale fn | Whymarrh Whitby | 2018-07-12 | 1 | -2/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #4779 from whymarrh/tx-view-tooltips | Whymarrh Whitby | 2018-07-13 | 2 | -13/+30 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add Tooltips to Balance View in Extension | ||||
| | * | | | | | | Add tooltip to new tab icon in tx-view | Whymarrh Whitby | 2018-07-12 | 2 | -4/+11 |
| | | | | | | | | |||||
| | * | | | | | | Add tooltip to menu icon in tx-view | Whymarrh Whitby | 2018-07-12 | 2 | -9/+19 |
| |/ / / / / / | |||||
* | | | | | | | added TREZOR simulator instructions | brunobar79 | 2018-07-14 | 2 | -0/+26 |
| | | | | | | | |||||
* | | | | | | | restore circleci config | brunobar79 | 2018-07-14 | 1 | -19/+19 |
| | | | | | | | |||||
* | | | | | | | remove trezor script | brunobar79 | 2018-07-14 | 1 | -10/+0 |
| | | | | | | | |||||
* | | | | | | | add changelog | brunobar79 | 2018-07-14 | 1 | -1/+3 |
| | | | | | | | |||||
* | | | | | | | cache circleci | brunobar79 | 2018-07-14 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | update label | brunobar79 | 2018-07-14 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | fix account selection | brunobar79 | 2018-07-14 | 2 | -3/+11 |
| | | | | | | | |||||
* | | | | | | | added affiliate link to trezor | brunobar79 | 2018-07-14 | 3 | -0/+25 |
| | | | | | | | |||||
* | | | | | | | detect ability to open popup instead of browser | brunobar79 | 2018-07-13 | 2 | -6/+13 |
| | | | | | | | |||||
* | | | | | | | test ci | brunobar79 | 2018-07-13 | 1 | -19/+19 |
| | | | | | | | |||||
* | | | | | | | avoid fallback cache | brunobar79 | 2018-07-13 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | update package-lock.json | brunobar79 | 2018-07-13 | 1 | -45/+25 |
| | | | | | | | |||||
* | | | | | | | fix account balance bug | brunobar79 | 2018-07-13 | 2 | -10/+16 |
| | | | | | | | |||||
* | | | | | | | remove account modal updated | brunobar79 | 2018-07-13 | 3 | -17/+57 |
| | | | | | | | |||||
* | | | | | | | catching up with develop | brunobar79 | 2018-07-13 | 5 | -27/+80 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-13 | 134 | -814/+5293 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | initial-trezor-support | ||||
| * | | | | | | Merge pull request #4691 from MetaMask/i4404-confirm-refactor | Alexander Tseung | 2018-07-12 | 125 | -775/+5145 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Refactor and redesign confirm transaction views | ||||
| | * | | | | | Fix font sizes, colors. Include data tab for send-eth transaction ↵ | Alexander Tseung | 2018-07-12 | 4 | -4/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | confirmations that have data | ||||
| | * | | | | | Merge pull request #4764 from MetaMask/i4404-confirm-refactor-with-e2e-upgrades | Dan J Miller | 2018-07-12 | 15 | -154/+585 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | e2e beta test upgrades for confirm refactor | ||||
| | | * | | | | | Wait for an element with a .tx-list-pending-item-container to be rendered ↵ | Dan | 2018-07-12 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before attempting to select the tx-list-item. (e2e beta tests) | ||||
| | | * | | | | | Reattempt to find network selector; wait for network selector dropdown to ↵ | Dan | 2018-07-12 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contain localhost before attempting to click. (e2e beta tests) | ||||
| | | * | | | | | Wait for submitted tx list item amounts to match the expected before ↵ | Dan | 2018-07-12 | 1 | -5/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clicking through. (e2e beta tests) | ||||
| | | * | | | | | Fix bug in test mock signature request methods. | Dan | 2018-07-12 | 5 | -3/+42 |
| | | | | | | | | |||||
| | | * | | | | | Fix send integration tests for compatability with confirm refactor. | Dan | 2018-07-11 | 4 | -7/+61 |
| | | | | | | | | |||||
| | | * | | | | | Fix signature request tests for compatability with confirm refactor. | Dan | 2018-07-11 | 2 | -12/+37 |
| | | | | | | | | |||||
| | | * | | | | | Update e2e beta tests to cover confirm refactor changes. | Dan | 2018-07-11 | 3 | -4/+155 |
| | | | | | | | | |||||
| | | * | | | | | Fix existing e2e tests | Dan | 2018-07-11 | 1 | -11/+26 |
| | | | | | | | | |||||
| | | * | | | | | Handles window indeterminancy issues for external dapps in e2e beta tests. | Dan | 2018-07-11 | 4 | -114/+255 |
| | |/ / / / / | |||||
| | * | | | | | Fix multiple signature requests showing an infinite spinner | Alexander Tseung | 2018-07-11 | 1 | -2/+11 |
| | | | | | | | |||||
| | * | | | | | Add unit tests for confirmTransaction duck and util | Alexander Tseung | 2018-07-10 | 2 | -0/+812 |
| | | | | | | | |||||
| | * | | | | | Fix existing unit tests | Alexander Tseung | 2018-07-08 | 4 | -71/+70 |
| | | | | | | | |||||
| | * | | | | | Various fixes from PR comments | Alexander Tseung | 2018-07-07 | 16 | -23515/+335 |
| | | | | | | | |||||
| | * | | | | | Use eth-method-registry to get method data | Alexander Tseung | 2018-07-07 | 12 | -36/+20002 |
| | | | | | | | |||||
| | * | | | | | Display newest transaction | Alexander Tseung | 2018-07-07 | 4 | -6/+6 |
| | | | | | | | |||||
| | * | | | | | Refactor data flow, signature request routing | Alexander Tseung | 2018-07-07 | 9 | -117/+185 |
| | | | | | | | |||||
| | * | | | | | Refactor and redesign confirm transaction views | Alexander Tseung | 2018-07-07 | 105 | -558/+6807 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #4769 from MetaMask/i4517-submit-password | Alexander Tseung | 2018-07-12 | 3 | -38/+40 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Prevent users from submitting password multiple times on the unlock s… | ||||
| | * | | | | | | Prevent users from submitting password multiple times on the unlock screen | Alexander Tseung | 2018-07-11 | 3 | -38/+40 |
| | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge pull request #4667 from MetaMask/i#3896 | Frankie | 2018-07-11 | 6 | -6/+119 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | transactions - remove rejected transactions from history | ||||
| | * | | | | | test - check that #setTxStatusRejected removes transaction from history | frankiebee | 2018-07-11 | 1 | -0/+9 |
| | | | | | | | |||||
| | * | | | | | test - fix for lint | frankiebee | 2018-07-11 | 1 | -5/+5 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'develop' of https://github.com/MetaMask/metamask-extension ↵ | frankiebee | 2018-07-11 | 214 | -33187/+34936 |
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | into i#3896 | ||||
| * | | | | | | Merge pull request #4765 from MetaMask/bmd/readme-link | Whymarrh Whitby | 2018-07-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | fix readme documentation link | ||||
| | * | | | | | fix readme documentation link | Bobby Dresser | 2018-07-11 | 1 | -1/+1 |
| |/ / / / / | |||||
| | * | | | | tests - fix cancle transaction test to better fit new behavior | frankiebee | 2018-06-27 | 2 | -13/+10 |
| | | | | | | |||||
| | * | | | | woops - remove .only | frankiebee | 2018-06-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: @jennypollack | ||||
| | * | | | | add to CHANGELOG.md | frankiebee | 2018-06-26 | 1 | -0/+2 |
| | | | | | | |||||
| | * | | | | trandsactions - remove rejected transactions from history | frankiebee | 2018-06-26 | 2 | -0/+20 |
| | | | | | | |||||
| | * | | | | migration 27 - remove rejected transactions from state | frankiebee | 2018-06-26 | 2 | -0/+85 |
| | |/ / / | |||||
* | | | | | added tooltip | brunobar79 | 2018-07-12 | 4 | -6/+17 |
| | | | | | |||||
* | | | | | forget device and autiload account features added | brunobar79 | 2018-07-12 | 6 | -2/+134 |
| | | | | | |||||
* | | | | | update to temp dependencies | brunobar79 | 2018-07-12 | 3 | -16/+18 |
| | | | | | |||||
* | | | | | clean up | brunobar79 | 2018-07-11 | 3 | -6/+6 |
| | | | | | |||||
* | | | | | account removal is working | brunobar79 | 2018-07-11 | 6 | -15/+79 |
| | | | | | |||||
* | | | | | finish warning modal UI | brunobar79 | 2018-07-11 | 9 | -3/+120 |
| | | | | | |||||
* | | | | | added ui to remove accounts | brunobar79 | 2018-07-10 | 3 | -4/+50 |
| | | | | | |||||
* | | | | | fix trezor label | brunobar79 | 2018-07-10 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | added label for trezor accounts | brunobar79 | 2018-07-10 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | fix account duplication | brunobar79 | 2018-07-10 | 2 | -7/+3 |
| | | | | | |||||
* | | | | | fix all the account related bugs | brunobar79 | 2018-07-10 | 3 | -17/+42 |
| | | | | | |||||
* | | | | | copy updated | brunobar79 | 2018-07-07 | 3 | -3/+6 |
| | | | | | |||||
* | | | | | update package-lock.json | brunobar79 | 2018-07-07 | 2 | -242/+50 |
| | | | | | |||||
* | | | | | update connect harwdware screen | brunobar79 | 2018-07-07 | 3 | -9/+34 |
| | | | | | |||||
* | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-07 | 60 | -275/+1091 |
|\| | | | | | | | | | | | | | | | | | | | initial-trezor-support | ||||
| * | | | | Merge pull request #4743 from MetaMask/circle-ci-node-modules-caching-fix | Bruno Barbieri | 2018-07-07 | 3 | -37/+46 |
| |\ \ \ \ | | | | | | | | | | | | | Improve CircleCI workflow | ||||
| | * | | | | Added missing step | Bruno Barbieri | 2018-07-07 | 1 | -0/+2 |
| | | | | | | |||||
| | * | | | | dont cache what's already cached | Bruno Barbieri | 2018-07-07 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Firefox tests fix | Bruno Barbieri | 2018-07-07 | 1 | -0/+2 |
| | | | | | | |||||
| | * | | | | Update firefox version | Bruno Barbieri | 2018-07-07 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | lets cache firefox 61 | Bruno Barbieri | 2018-07-07 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Forgot this is linux bash | Bruno Barbieri | 2018-07-07 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Update config.yml | Bruno Barbieri | 2018-07-07 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Update config.yml | Bruno Barbieri | 2018-07-07 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Update firefox-download.sh | Bruno Barbieri | 2018-07-07 | 1 | -2/+3 |
| | | | | | | |||||
| | * | | | | Fix indentation | Bruno Barbieri | 2018-07-07 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Firefox cache working properly | Bruno Barbieri | 2018-07-07 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | oops | Bruno Barbieri | 2018-07-07 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | tmp commit to force firefox update | Bruno Barbieri | 2018-07-07 | 1 | -13/+8 |
| | | | | | | |||||
| | * | | | | Update firefox-download.sh | Bruno Barbieri | 2018-07-07 | 1 | -4/+3 |
| | | | | | | |||||
| | * | | | | Add firefox binary to cache path | Bruno Barbieri | 2018-07-07 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Allow firefox binary to be cached | Bruno Barbieri | 2018-07-07 | 1 | -4/+11 |
| | | | | | | |||||
| | * | | | | Update config.yml to allow firefox download caching | Bruno Barbieri | 2018-07-07 | 1 | -6/+8 |
| | | | | | | |||||
| | * | | | | Final approach | Bruno Barbieri | 2018-07-07 | 1 | -6/+2 |
| | | | | | | |||||
| | * | | | | Fix indentation again | Bruno Barbieri | 2018-07-07 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fix indentation | Bruno Barbieri | 2018-07-07 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Run npm install only when needed | Bruno Barbieri | 2018-07-07 | 1 | -1/+4 |
| | | | | | | |||||
| | * | | | | simpler approach | Bruno Barbieri | 2018-07-07 | 1 | -9/+2 |
| | | | | | | |||||
| | * | | | | Fallback to using the latest cache if no exact match is found | Bruno Barbieri | 2018-07-07 | 1 | -1/+4 |
| | | | | | | |||||
| | * | | | | Check for changes on package-lock.json and exit with error | Bruno Barbieri | 2018-07-07 | 1 | -0/+5 |
| | | | | | | |||||
| | * | | | | try npm install instead of npm ci | Bruno Barbieri | 2018-07-06 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Update config.yml | Bruno Barbieri | 2018-07-06 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fix indentation | Bruno Barbieri | 2018-07-06 | 1 | -4/+4 |
| | | | | | | |||||
| | * | | | | Update config.yml | Bruno Barbieri | 2018-07-06 | 1 | -2/+6 |
| | | | | | | |||||
| | * | | | | Update config.yml | Bruno Barbieri | 2018-07-06 | 1 | -3/+0 |
| | | | | | | |||||
| | * | | | | Update config.yml | Bruno Barbieri | 2018-07-06 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | use sudo to install npm | Bruno Barbieri | 2018-07-06 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Another update | Bruno Barbieri | 2018-07-06 | 1 | -23/+22 |
| | | | | | | |||||
| | * | | | | use package-lock only for the initial restore | Bruno Barbieri | 2018-07-06 | 1 | -17/+21 |
| | | | | | | |||||
| | * | | | | Proper caching of node_modules | Bruno Barbieri | 2018-07-06 | 1 | -22/+18 |
| |/ / / / | |||||
| * | | | | Merge pull request #4738 from MetaMask/bmd/contrib-guidelines | Dan Finlay | 2018-07-06 | 1 | -18/+13 |
| |\ \ \ \ | | | | | | | | | | | | | update contributing.md | ||||
| | * | | | | update contributing.md | Bobby Dresser | 2018-07-06 | 1 | -18/+13 |
| |/ / / / | |||||
| * | | | | Merge pull request #4648 from MetaMask/update-import-from-seed-screen | Dan J Miller | 2018-07-06 | 5 | -155/+187 |
| |\ \ \ \ | | | | | | | | | | | | | Update import from seed screen on new ui. | ||||
| | * | | | | Delete old restore vault file. | Dan | 2018-07-06 | 3 | -341/+163 |
| | | | | | | |||||
| | * | | | | Update import from seed screen on new ui. | Dan | 2018-07-05 | 5 | -4/+214 |
| | | | | | | |||||
| * | | | | | Merge pull request #4694 from MetaMask/i4660-improve-send-token-error-ui | Dan J Miller | 2018-07-06 | 18 | -17/+320 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Improve send token error ux. | ||||
| | * | | | | | Improve send token error ux. | Dan | 2018-07-05 | 18 | -17/+320 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #4733 from whymarrh/fix-setstate-warnings | Whymarrh Whitby | 2018-07-06 | 3 | -0/+14 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix setState warnings in components using TokenTracker | ||||
| | * | | | | | | Don't update token balances after tracker is stopped | Whymarrh Whitby | 2018-07-05 | 3 | -0/+10 |
| | | | | | | | | |||||
| | * | | | | | | Remove TokenTracker listeners when unmounting component | Whymarrh Whitby | 2018-07-05 | 2 | -0/+4 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #4734 from whymarrh/txlistitem-setstate-warning | Whymarrh Whitby | 2018-07-06 | 1 | -0/+9 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Prevent calling setState in TxListItem after unmount | ||||
| | * | | | | | | | Prevent calling setState in TxListItem after unmount | Whymarrh Whitby | 2018-07-05 | 1 | -0/+9 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge pull request #4617 from TrejGun/fix-new-line | Dan J Miller | 2018-07-06 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | fix white spaces in signature | ||||
| | * | | | | | | | fix white spaces in signature | trejgun | 2018-06-20 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #4735 from whymarrh/restore-vault-focus | Dan J Miller | 2018-07-06 | 1 | -3/+0 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Don't persist the seed phrase in the old UI restore flow | ||||
| | * | | | | | | | | Don't persist the seed phrase in the old UI restore flow | Whymarrh Whitby | 2018-07-05 | 1 | -3/+0 |
| | | |/ / / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge pull request #4686 from MetaMask/tweak-token-list-amount-style | Dan J Miller | 2018-07-05 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | Ensures token list amount is in its own row. | ||||
| | * | | | | | | | Ensures token list amount is in its own row. | Dan | 2018-07-05 | 1 | -0/+1 |
| | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #4685 from MetaMask/estimate-gasprice-background-newui | Dan J Miller | 2018-07-05 | 3 | -26/+22 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | Use background gas price estimation method in new ui. | ||||
| | * | | | | | | Improve error and promise resolution handling in action.js updateGasData(). | Dan | 2018-07-05 | 1 | -13/+14 |
| | | | | | | | | |||||
| | * | | | | | | Update new-ui-send integration tests to always explicitly set gas price. ↵ | Dan | 2018-07-05 | 1 | -12/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (e2e tests handle auto-setting and defaults) | ||||
| | * | | | | | | Remove unnecessary anonymous function call in actions.js gas estimation. | Dan | 2018-07-04 | 1 | -7/+6 |
| | | | | | | | | |||||
| | * | | | | | | Use background gas price estimation method in new ui. | Dan | 2018-06-29 | 2 | -8/+15 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #4721 from MetaMask/i4666-gasLimit | Dan J Miller | 2018-07-05 | 2 | -12/+5 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | fixes #4666 getGasLimit and getGasPrice removed and replaced | ||||
| | * | | | | | | | fixes 4666 | Sara Reynolds | 2018-07-04 | 1 | -2/+5 |
| | | | | | | | | | |||||
| | * | | | | | | | :qw | Sara Reynolds | 2018-07-04 | 1 | -10/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | :wq q | ||||
| * | | | | | | | | Merge pull request #4405 from PortalNetwork/portal-metamask | Dan Finlay | 2018-07-05 | 21 | -7/+473 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | Integration ENS with IPFS | ||||
| | * | | | | | | | Merge pull request #4 from brunobar79/portal-metamask-lint-fix | PhyrexTsai | 2018-07-04 | 352 | -34570/+42735 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Lint fix for Integration ENS with IPFS | ||||
| | | * | | | | | | | fix lint errors | brunobar79 | 2018-07-04 | 5 | -25/+81 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Merge remote-tracking branch 'upstream/develop' into HEAD | brunobar79 | 2018-07-04 | 349 | -34563/+42672 |
| | |/| | | | | | | | |||||
| | * | | | | | | | | Update to support pathnames on IPFS hash | PhyrexTsai | 2018-06-29 | 1 | -4/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As @Georgi87 mentioned about pathnames on the domain like `http://phyrextsai.eth/home` will pass to IPFS hash and append `/home` on redirection url. You can try the example below: http://phyrextsai.eth/index.html http://phyrextsai.eth/images/phyrex.jpg | ||||
| | * | | | | | | | | Update 404.html | PhyrexTsai | 2018-06-02 | 1 | -1/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'develop' into portal-metamask | PhyrexTsai | 2018-06-01 | 70 | -393/+2060 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Update 404 | Yung chieh Tsai | 2018-06-01 | 1 | -1/+0 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Update ipfs to infura | Yung chieh Tsai | 2018-06-01 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Update manifest.json | Yung chieh Tsai | 2018-06-01 | 1 | -4/+3 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Update app | Yung chieh Tsai | 2018-05-30 | 1 | -7/+0 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Update default provider | Yung chieh Tsai | 2018-05-30 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Update lib | Yung chieh Tsai | 2018-05-29 | 3 | -23/+71 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Rename files | Yung chieh Tsai | 2018-05-29 | 10 | -1912/+119 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Update manifest.json | Yung chieh Tsai | 2018-05-29 | 1 | -4/+0 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Intergrate ENS with IPFS | MikeCheng1208 | 2018-05-29 | 2 | -1/+5 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | setTimeout bug fix | MikeCheng1208 | 2018-05-29 | 1 | -2/+5 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Intergrate ENS with IPFS | MikeCheng1208 | 2018-05-29 | 21 | -6/+2157 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | UI refactor | brunobar79 | 2018-07-06 | 4 | -99/+110 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Refactor UI | brunobar79 | 2018-07-06 | 4 | -266/+328 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | move strings to localization file | brunobar79 | 2018-07-06 | 2 | -11/+21 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | added message for non-chrome browsers | brunobar79 | 2018-07-06 | 2 | -1/+39 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | package.json updated and tests passing | brunobar79 | 2018-07-04 | 2 | -0/+58 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | tests are passing | brunobar79 | 2018-07-04 | 2 | -39263/+30830 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'develop' into initial-trezor-support | brunobar79 | 2018-07-04 | 1 | -0/+1 |
|\| | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #4719 from MetaMask/kumavis-patch-3 | kumavis | 2018-07-04 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | lint - ignore test-builds dir | ||||
| | * | | | | | | | | | Update .eslintignore | kumavis | 2018-07-04 | 1 | -0/+1 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | package-lock update | brunobar79 | 2018-07-04 | 1 | -27/+10 |
| | | | | | | | | | | |||||
* | | | | | | | | | | lint fix | brunobar79 | 2018-07-04 | 2 | -3/+3 |
| | | | | | | | | | | |||||
* | | | | | | | | | | fix merge conflicts | brunobar79 | 2018-07-04 | 9 | -864/+13539 |
|\| | | | | | | | | | |||||
| * | | | | | | | | | Merge pull request #4718 from MetaMask/ignore-superstatic-vulnerability | Bruno Barbieri | 2018-07-04 | 2 | -14/+9 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | ignore lodash vulnerability | ||||
| | * | | | | | | | | | ignore lodash vulnerability | brunobar79 | 2018-07-04 | 2 | -14/+9 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #4716 from MetaMask/i4663-clearErrorMessages | Dan J Miller | 2018-07-04 | 2 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | fixes #4663 - Clear Error Messages when Importing Accounts are Successful | ||||
| | * | | | | | | | | | fixes 4663 | Sara Reynolds | 2018-07-04 | 2 | -0/+2 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #4717 from MetaMask/chrome-promise-bugfix | Dan Finlay | 2018-07-04 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | Conditionally use Promise-based extension API when creating windows | ||||
| | * | | | | | | | | Conditionally use Promise-based extension API when creating windows | bitpshr | 2018-07-04 | 1 | -4/+4 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge pull request #4654 from TrejGun/bignumber | Dan J Miller | 2018-07-04 | 2 | -1/+23 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | fixes #4307 BigNumber casting issue | ||||
| | * | | | | | | | | lint | trejgun | 2018-06-29 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | change numbers | trejgun | 2018-06-24 | 1 | -7/+6 |
| | | | | | | | | | | |||||
| | * | | | | | | | | remove .only | trejgun | 2018-06-24 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fixes #4307 BigNumber casting issue | trejgun | 2018-06-24 | 2 | -1/+24 |
| | | |_|_|_|/ / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge pull request #4633 from MetaMask/i4580-import-account-errors | Alexander Tseung | 2018-07-04 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Show all errors on account creation screen. | ||||
| | * | | | | | | | | Check that error is defined in import-account error catch. | Dan | 2018-06-29 | 2 | -2/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Show all errors on account creation screen. | Dan | 2018-06-29 | 2 | -2/+2 |
| | | |_|_|_|/ / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge pull request #4699 from TrejGun/removeLeadingZeroes | Dan J Miller | 2018-07-04 | 3 | -4/+36 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | move removeLeadingZeroes to utils, add test | ||||
| | * | | | | | | | move removeLeadingZeroes to utils, add test | trejgun | 2018-07-02 | 3 | -4/+36 |
| | | | | | | | | | |||||
* | | | | | | | | | fix merge conflicts | brunobar79 | 2018-07-04 | 125 | -739/+710 |
|\| | | | | | | | | |||||
| * | | | | | | | | Merge pull request #4712 from MetaMask/lint-fix | kumavis | 2018-07-04 | 125 | -738/+689 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Lint - Lint all the things (without conflicts!) | ||||
| | * | | | | | | | | fix contract-test | brunobar79 | 2018-07-03 | 1 | -3/+7 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix unit tests | brunobar79 | 2018-07-03 | 1 | -4/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix tests | brunobar79 | 2018-07-03 | 2 | -6/+12 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix warning for new-ui screen tests | brunobar79 | 2018-07-03 | 1 | -4/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix warning for unit tests | brunobar79 | 2018-07-03 | 14 | -68/+35 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix test/mascara.conf.js warnings | brunobar79 | 2018-07-03 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix warnings for integration tests | brunobar79 | 2018-07-03 | 3 | -7/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix warnings for e2e tests | brunobar79 | 2018-07-03 | 3 | -10/+8 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix notices warning | brunobar79 | 2018-07-03 | 1 | -4/+5 |
| | | | | | | | | | | |||||
| | * | | | | | | | | add QUnit to eslint globals | brunobar79 | 2018-07-03 | 1 | -1/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix gentests.js | brunobar79 | 2018-07-03 | 1 | -2/+3 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix mascara warnings | brunobar79 | 2018-07-03 | 3 | -7/+6 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix mascara/example/server.js warnings | brunobar79 | 2018-07-03 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix gentests.js warnings | brunobar79 | 2018-07-03 | 1 | -63/+69 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix version-bump.js | brunobar79 | 2018-07-03 | 1 | -4/+0 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix verify-locale-strings.js | brunobar79 | 2018-07-03 | 1 | -3/+4 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix ui-dev.js warnings | brunobar79 | 2018-07-03 | 1 | -1/+0 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix sourcemap-validator.js warnings | brunobar79 | 2018-07-03 | 1 | -4/+7 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix mock-dev.js warnings | brunobar79 | 2018-07-03 | 1 | -2/+0 |
| | | | | | | | | | | |||||
| | * | | | | | | | | fix beefy.js warnings | brunobar79 | 2018-07-03 | 1 | -3/+0 |
| | | | | | | | | | | |||||
| | * | | | | | | | | add $ to globals | brunobar79 | 2018-07-03 | 1 | -1/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | eslint --fix . | brunobar79 | 2018-07-03 | 116 | -533/+530 |
| | | | | | | | | | | |||||
| | * | | | | | | | | remove gulp eslint and cleanup gulpfile | brunobar79 | 2018-07-03 | 2 | -32/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | update eslint rules and paths | brunobar79 | 2018-07-03 | 2 | -1/+16 |
| | | | | | | | | | |