Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix tests | Alexander Tseung | 2018-07-18 | 4 | -76/+13 |
* | Add fallback when no function found, fix network colors, add fiat values for ... | Alexander Tseung | 2018-07-18 | 17 | -104/+322 |
* | Remove unused confirm transaction files | Alexander Tseung | 2018-07-18 | 4 | -299/+23 |
* | 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 | Alexander Tseung | 2018-07-17 | 3 | -22/+16 |
* | | Merge pull request #4777 from MetaMask/i4661-currencyConversionBug | Whymarrh Whitby | 2018-07-18 | 2 | -11/+31 |
|\ \ | |/ |/| | |||||
| * | 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 |
|/ | |||||
* | Merge pull request #4621 from MetaMask/one-send-directory | Whymarrh Whitby | 2018-07-17 | 129 | -55/+173 |
|\ | |||||
| * | 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 |
* | | Merge pull request #4636 from MetaMask/bmd/tos-link | Whymarrh Whitby | 2018-07-16 | 5 | -6/+5 |
|\ \ | |/ |/| | |||||
| * | 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 |
|\ \ | |||||
| * | | 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 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'develop' into contextTypes | TrejGun | 2018-07-05 | 157 | -33248/+33516 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | convert contextType to static prop for refactored components | trejgun | 2018-07-05 | 14 | -60/+57 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #4787 from MetaMask/stop-inject-harbourair | Thomas Huang | 2018-07-13 | 1 | -0/+1 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Add harbourair.com to injection block list | Dan Finlay | 2018-07-13 | 1 | -0/+1 |
|/ / / | |||||
* | | | Merge pull request #4669 from MetaMask/removeNonceTrackerFunction | Thomas Huang | 2018-07-13 | 1 | -13/+0 |
|\ \ \ | |||||
| * \ \ | 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 |
|\ \ \ \ \ | |||||
| * | | | | | 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 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 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #4691 from MetaMask/i4404-confirm-refactor | Alexander Tseung | 2018-07-12 | 125 | -775/+5145 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Fix font sizes, colors. Include data tab for send-eth transaction confirmatio... | Alexander Tseung | 2018-07-12 | 4 | -4/+20 |
| * | | | | | Merge pull request #4764 from MetaMask/i4404-confirm-refactor-with-e2e-upgrades | Dan J Miller | 2018-07-12 | 15 | -154/+585 |
| |\ \ \ \ \ | |||||
| | * | | | | | Wait for an element with a .tx-list-pending-item-container to be rendered bef... | Dan | 2018-07-12 | 1 | -0/+2 |
| | * | | | | | Reattempt to find network selector; wait for network selector dropdown to con... | Dan | 2018-07-12 | 1 | -3/+6 |
| | * | | | | | Wait for submitted tx list item amounts to match the expected before clicking... | Dan | 2018-07-12 | 1 | -5/+6 |
| | * | | | | | 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 screen | Alexander Tseung | 2018-07-11 | 3 | -38/+40 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #4667 from MetaMask/i#3896 | Frankie | 2018-07-11 | 6 | -6/+119 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | 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 into... | frankiebee | 2018-07-11 | 214 | -33187/+34936 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #4765 from MetaMask/bmd/readme-link | Whymarrh Whitby | 2018-07-11 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | fix readme documentation link | Bobby Dresser | 2018-07-11 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #4743 from MetaMask/circle-ci-node-modules-caching-fix | Bruno Barbieri | 2018-07-07 | 3 | -37/+46 |
|\ \ \ \ \ | |||||
| * | | | | | 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 | 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 |
|\ \ \ \ \ | |||||
| * | | | | | 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. | Dan | 2018-07-05 | 18 | -17/+320 |
* | | | | | | | Merge pull request #4733 from whymarrh/fix-setstate-warnings | Whymarrh Whitby | 2018-07-06 | 3 | -0/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 | 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 | 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 | 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. | 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 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | 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. (e2e... | Dan | 2018-07-05 | 1 | -12/+1 |
| * | | | | | | | 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 | Sara Reynolds | 2018-07-04 | 1 | -2/+5 |
| * | | | | | | | | :qw | Sara Reynolds | 2018-07-04 | 1 | -10/+0 |
* | | | | | | | | | Merge pull request #4405 from PortalNetwork/portal-metamask | Dan Finlay | 2018-07-05 | 21 | -7/+473 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge pull request #4 from brunobar79/portal-metamask-lint-fix | PhyrexTsai | 2018-07-04 | 352 | -34570/+42735 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | 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 |
| * | | | | | | | | | 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 |
* | | | | | | | | | | | Merge pull request #4719 from MetaMask/kumavis-patch-3 | kumavis | 2018-07-04 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Update .eslintignore | kumavis | 2018-07-04 | 1 | -0/+1 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge pull request #4718 from MetaMask/ignore-superstatic-vulnerability | Bruno Barbieri | 2018-07-04 | 2 | -14/+9 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | 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 | 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 | bitpshr | 2018-07-04 | 1 | -4/+4 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #4654 from TrejGun/bignumber | Dan J Miller | 2018-07-04 | 2 | -1/+23 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | 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 | trejgun | 2018-07-02 | 3 | -4/+36 |
* | | | | | | | | | Merge pull request #4712 from MetaMask/lint-fix | kumavis | 2018-07-04 | 125 | -738/+689 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | 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 |
* | | | | | | | | | | Merge pull request #4709 from MetaMask/pointMasterContractMetadata | Esteban Miño | 2018-07-03 | 2 | -4/+3 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | point eth-contract-metadata to repo master | Esteban MIno | 2018-07-03 | 2 | -4/+3 |
|/ / / / / / / / / | |||||
* | | | | | | | | | npm 6 fresh lock + node 8 (#4675) | Bruno Barbieri | 2018-07-03 | 4 | -32479/+32280 |
* | | | | | | | | | Merge pull request #4692 from MetaMask/improve-e2e-beta-test-startup | Whymarrh Whitby | 2018-07-02 | 1 | -5/+11 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Improve checks for closing info page on app installation in e2e beta tests. | Dan | 2018-06-29 | 1 | -5/+11 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #4687 from snreynolds/i4623-getConvertedCurrency | Dan J Miller | 2018-06-30 | 8 | -24/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fixes #4623 | Sara Reynolds | 2018-06-30 | 8 | -24/+9 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #4640 from weijiekoh/develop | Dan J Miller | 2018-06-30 | 2 | -1/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fixed lint error | Koh Wei Jie | 2018-06-28 | 1 | -1/+1 |
| * | | | | | | | | removed stray console.log | Koh Wei Jie | 2018-06-22 | 1 | -1/+0 |
| * | | | | | | | | fixed blank boolean field for typed signing for old UI | Koh Wei Jie | 2018-06-22 | 1 | -1/+5 |
| * | | | | | | | | fixed blank boolean field for typed signing for new UI | Koh Wei Jie | 2018-06-22 | 1 | -0/+4 |
* | | | | | | | | | Merge pull request #4647 from MetaMask/fix-overflow-currency-display | Dan J Miller | 2018-06-30 | 3 | -2/+12 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Improve attribute syntax in send-amount-row.component.js | Dan J Miller | 2018-06-30 | 1 | -1/+1 |
| * | | | | | | | | | Remove input arrows for send screen amount row on firefox. | Dan | 2018-06-29 | 3 | -0/+11 |
| * | | | | | | | | | Fix issues with scrollbar in currency display. | Dan | 2018-06-29 | 2 | -2/+1 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #4690 from MetaMask/i4662-token-gas-estimate-ux | Dan Finlay | 2018-06-29 | 3 | -0/+11 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Set based estimate for token sends to be updated once recipient address speci... | Dan | 2018-06-29 | 3 | -0/+11 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #4634 from MetaMask/i4503-touch-up-shpshft-button-style | Thomas Huang | 2018-06-29 | 2 | -7/+26 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fix style of shapeshift screen in deposit modal. | Dan | 2018-06-22 | 2 | -7/+26 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #4678 from MetaMask/e2e-beta-tests-upgrade | Dan J Miller | 2018-06-29 | 10 | -6749/+7671 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use supersonic instead of httpserver to serve local dapp (e2e beta tests) | Dan | 2018-06-28 | 3 | -21/+543 |
| * | | | | | | | | Turn off failing e2e beta assertion in firefox until bugs in webdriver/geckod... | Dan | 2018-06-28 | 1 | -2/+6 |
| * | | | | | | | | Update condition for backspace in customize gas step of token factory send te... | Dan | 2018-06-28 | 1 | -1/+4 |
| * | | | | | | | | Update package-lock.json | Dan | 2018-06-28 | 1 | -6526/+6601 |
| * | | | | | | | | Fix add existing token test (e2e beta tests). | Dan | 2018-06-27 | 1 | -3/+1 |
| * | | | | | | | | Switch to eth and back before asserting on token balance (e2e beta token tests). | Dan | 2018-06-27 | 1 | -1/+2 |
| * | | | | | | | | await all clicks in e2e beta tests. | Dan | 2018-06-27 | 1 | -9/+11 |
| * | | | | | | | | Close popup window for e2e beta token factory send test. | Dan | 2018-06-27 | 1 | -2/+3 |
| * | | | | | | | | Fix retype seed phrase button. | Dan | 2018-06-27 | 1 | -35/+46 |
| * | | | | | | | | Disable e2e beta assertion after first token addition because of firefox / we... | Dan | 2018-06-27 | 1 | -1/+8 |
| * | | | | | | | | Pass correct params to verboseReportOnFailure in beta e2e tests. | Dan | 2018-06-27 | 1 | -1/+1 |
| * | | | | | | | | Add timeouts to certain beta e2e driver.waits. | Dan | 2018-06-27 | 1 | -2/+2 |
| * | | | | | | | | Add try catch to deal with false negative timeouts in beta e2e tests. | Dan | 2018-06-27 | 1 | -7/+22 |
| * | | | | | | | | Wait for element text match in metamask-beta-ui e2e send token test | Dan | 2018-06-27 | 1 | -4/+2 |
| * | | | | | | | | Use locally served dapp to test contract calls in e2e beta tests | Dan | 2018-06-27 | 6 | -174/+131 |
| * | | | | | | | | Add extra delay to e2e tests after remix page load. | Dan | 2018-06-27 | 1 | -0/+1 |
| * | | | | | | | | Fix send token tests in beta ui e2e tests. | Dan | 2018-06-27 | 2 | -9/+26 |
| * | | | | | | | | Speed up page opening and fix timeout errors on remix page opening in beta e2... | Dan | 2018-06-27 | 2 | -13/+26 |
| * | | | | | | | | Add delay before regularly failing test. | Dan | 2018-06-27 | 1 | -0/+1 |
| * | | | | | | | | Fix element located bug in beta e2e contract method call test. | Dan | 2018-06-27 | 1 | -1/+1 |
| * | | | | | | | | Improve wait for buy modal render after first time flow in beta e2e tests. | Dan | 2018-06-27 | 1 | -1/+2 |
| * | | | | | | | | Only show the customize gas modal if the estimateGas call is not currently in... | Dan | 2018-06-27 | 4 | -6/+79 |
| * | | | | | | | | Update metamask-beta-ui e2e spec to fail on insufficient gas estimation. | Dan | 2018-06-27 | 1 | -7/+31 |
| * | | | | | | | | Wait for locating of submit buttons before attempting to click in metamask.sp... | Dan | 2018-06-27 | 1 | -3/+8 |
| * | | | | | | | | Update tests to accomodate token list menu additions. | Dan | 2018-06-27 | 1 | -1/+2 |
| * | | | | | | | | Disable onbeforeunload alert on remix for contract integration tests. | Dan | 2018-06-27 | 1 | -0/+1 |
| * | | | | | | | | Adds test for hiding tokens. | Dan | 2018-06-27 | 1 | -0/+19 |
| * | | | | | | | | e2e beta tests for contract deployment and calling a contract method. | Dan | 2018-06-27 | 2 | -2/+135 |
| * | | | | | | | | Improve reliability of beta e2e tests by using webdriver apis to wait for cer... | Dan | 2018-06-27 | 2 | -5/+12 |
| * | | | | | | | | Add test for importing from private key to from-import-beta-ui.spec.js, and r... | Dan | 2018-06-27 | 2 | -125/+19 |
| * | | | | | | | | metamask-beta-ui.spec.js tests custom token send before searched token. | Dan | 2018-06-27 | 1 | -38/+43 |
| * | | | | | | | | Adds e2e tests for sending tokens from token factory. | Dan | 2018-06-27 | 1 | -3/+61 |
| * | | | | | | | | Adds e2e tests for sending tokens within metamask. | Dan | 2018-06-27 | 1 | -0/+44 |
| * | | | | | | | | Adds e2e tests for sending tokens from token factory. | Dan | 2018-06-27 | 1 | -3/+61 |
| * | | | | | | | | Adds e2e tests for sending tokens within metamask. | Dan | 2018-06-27 | 1 | -2/+48 |
* | | | | | | | | | Merge pull request #4674 from MetaMask/removeOnlyTests | Thomas Huang | 2018-06-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Remove .only on test | tmashuang | 2018-06-27 | 1 | -1/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #4677 from MetaMask/customize-gas-loading-wait | Dan J Miller | 2018-06-28 | 4 | -6/+79 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Only show the customize gas modal if the estimateGas call is not currently in... | Dan | 2018-06-19 | 4 | -6/+79 |
* | | | | | | | | | | Merge pull request #4574 from MetaMask/i4409-i4410-ens-input-enhancements | Dan J Miller | 2018-06-28 | 7 | -41/+74 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Remove commented out code in ens-input. | Dan | 2018-06-22 | 1 | -1/+0 |
| * | | | | | | | | | Merge branch 'develop' into i4409-i4410-ens-input-enhancements | Dan | 2018-06-20 | 56 | -6786/+7086 |
| |\ \ \ \ \ \ \ \ \ |