Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1430 from MetaMask/i1407-FixNonEditingTxForm | kumavis | 2017-05-16 | 16 | -79/+225 |
|\ | | | | | Add test around conf-tx view's gas editing. | ||||
| * | lint - mandatory dangle | kumavis | 2017-05-16 | 1 | -1/+1 |
| | | | | | | :stuck_out_tongue: | ||||
| * | ui - send - clean props assignment | kumavis | 2017-05-16 | 1 | -8/+10 |
| | | |||||
| * | Merge branch 'master' into i1407-FixNonEditingTxForm | Dan Finlay | 2017-05-16 | 8 | -5777/+282 |
| |\ | |||||
| * | | Clean up test | Dan Finlay | 2017-05-16 | 1 | -14/+2 |
| | | | |||||
| * | | Linted | Dan Finlay | 2017-05-16 | 2 | -5/+6 |
| | | | |||||
| * | | Verify updating gas value updates | Dan Finlay | 2017-05-16 | 2 | -5/+5 |
| | | | |||||
| * | | Got test failing nearly correctly | Dan Finlay | 2017-05-16 | 3 | -15/+45 |
| | | | |||||
| * | | Skip jazzicons in unit tests | Dan Finlay | 2017-05-16 | 2 | -4/+11 |
| | | | |||||
| * | | Remove redux dependency from eth-balance and its dependent tree | Dan Finlay | 2017-05-13 | 11 | -35/+49 |
| | | | | | | | | | | | | For better unit testability of the conf-tx view. | ||||
| * | | Add support for async/await | Dan Finlay | 2017-05-13 | 3 | -3/+10 |
| | | | |||||
| * | | Got a useful error message for next step | Dan Finlay | 2017-05-12 | 2 | -2/+23 |
| | | | |||||
| * | | Fix test up a bit | Dan Finlay | 2017-05-12 | 1 | -6/+4 |
| | | | |||||
| * | | Use react test utils to start composing test | Dan Finlay | 2017-05-12 | 2 | -6/+23 |
| | | | |||||
| * | | Got test failing | Dan Finlay | 2017-05-12 | 1 | -1/+3 |
| | | | |||||
| * | | Fix tests add logs | Dan Finlay | 2017-05-12 | 1 | -3/+7 |
| | | | |||||
| * | | Add an attempt at a unit test for reproducing #1407 | Dan Finlay | 2017-05-11 | 1 | -0/+61 |
| | | | |||||
| * | | Break up pending-tx component for better unit testability | Dan Finlay | 2017-05-11 | 1 | -38/+39 |
| | | | |||||
* | | | Merge pull request #1432 from MetaMask/i1419-rinkebydefaultnetwork | kumavis | 2017-05-16 | 7 | -20/+12 |
|\ \ \ | | | | | | | | | I1419 rinkebydefaultnetwork | ||||
| * | | | Remove all traces of testnet | Thomas Huang | 2017-05-16 | 7 | -22/+14 |
| | | | | |||||
| * | | | Merge branch 'master' into i1419-rinkebydefaultnetwork | Thomas Huang | 2017-05-16 | 3 | -26/+20 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #1431 from MetaMask/pe-bump | Dan Finlay | 2017-05-16 | 2 | -1/+2 |
|\ \ \ \ | |_|_|/ |/| | | | Bump provider engine for event filters fix | ||||
| * | | | changelog - add note on filter fix | kumavis | 2017-05-16 | 1 | -0/+1 |
| | | | | |||||
| * | | | deps - bump provider-engine 12.0.6 | kumavis | 2017-05-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #1422 from MetaMask/drop-asyncq | Dan Finlay | 2017-05-16 | 2 | -25/+18 |
|\ \ \ \ | |/ / / |/| | | | background - drop async-q in favor of async/await | ||||
| * | | | Add stage 0 support to build system | Dan Finlay | 2017-05-16 | 1 | -2/+2 |
| | | | | |||||
| * | | | background - drop async-q in favor of async/await | kumavis | 2017-05-13 | 2 | -23/+16 |
| | | | | |||||
| | * | | Change default network to rinkeby | Thomas Huang | 2017-05-16 | 5 | -15/+15 |
| |/ / |/| | | |||||
* | | | Merge pull request #1417 from MetaMask/fixMigrator2 | Dan Finlay | 2017-05-13 | 3 | -21/+55 |
|\ \ \ | |/ / |/| | | Fix and simplify migrator with es7 | ||||
| * | | ci - use node 7.6.0 | kumavis | 2017-05-13 | 1 | -1/+1 |
| | | | |||||
| * | | migrator - fix typo | kumavis | 2017-05-13 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into fixMigrator2 | kumavis | 2017-05-13 | 8 | -5742/+233 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #1421 from MetaMask/es7 | kumavis | 2017-05-13 | 3 | -3/+10 |
|\ \ \ | | | | | | | | | Add support for async/await | ||||
| * | | | Add support for async/await | Dan Finlay | 2017-05-13 | 3 | -3/+10 |
|/ / / | |||||
* | | | Merge pull request #1416 from MetaMask/i1389-lesscurrency | kumavis | 2017-05-12 | 3 | -5731/+209 |
|\ \ \ | |_|/ |/| | | Trim currency list | ||||
| * | | Prettify JSON | Kevin Serrano | 2017-05-12 | 1 | -1/+207 |
| | | | |||||
| * | | Bump changelog | Kevin Serrano | 2017-05-12 | 1 | -0/+2 |
| | | | |||||
| * | | Trim currency list. | Kevin Serrano | 2017-05-12 | 2 | -5731/+1 |
|/ / | |||||
* | | Merge pull request #1404 from MetaMask/Version-3.6.4 | Thomas Huang | 2017-05-10 | 2 | -1/+5 |
|\ \ | | | | | | | Version 3.6.4 | ||||
| * | | Version 3.6.4v3.6.4 | Dan Finlay | 2017-05-10 | 2 | -1/+5 |
|/ / | |||||
* | | Merge pull request #1402 from MetaMask/ens-fix | Kevin Serrano | 2017-05-10 | 1 | -7/+9 |
|\ \ | | | | | | | ens - add mainnet ens support | ||||
| * | | ens - add mainnet ens support | kumavis | 2017-05-10 | 1 | -7/+9 |
|/ / | |||||
| * | migrator - cleaner migration runner with es7 | kumavis | 2017-05-12 | 1 | -25/+13 |
| | | |||||
| * | Create test for Migrator | frankiebee | 2017-05-12 | 1 | -0/+41 |
| | | |||||
| * | use asyncQ.waterfall instead of asyncQ.eachSeries | frankiebee | 2017-05-12 | 1 | -4/+10 |
| | | |||||
| * | fix migrator | frankiebee | 2017-05-11 | 1 | -9/+8 |
|/ | |||||
* | Merge pull request #1397 from MetaMask/Version-3.6.3 | kumavis | 2017-05-09 | 2 | -1/+5 |
|\ | | | | | Version 3.6.3 | ||||
| * | Version 3.6.3v3.6.3 | Dan Finlay | 2017-05-09 | 2 | -1/+5 |
|/ | |||||
* | Merge pull request #1394 from MetaMask/Version-3.6.2 | Kevin Serrano | 2017-05-09 | 2 | -1/+3 |
|\ | | | | | Version 3.6.2: Persnickety Pachycephalosaurus | ||||
| * | Version 3.6.2v3.6.2 | Dan Finlay | 2017-05-09 | 2 | -1/+3 |
|/ | |||||
* | Merge pull request #1393 from MetaMask/i1364-devwarning2 | Dan Finlay | 2017-05-09 | 3 | -2/+10 |
|\ | | | | | Add new beta notice. | ||||
| * | Add new beta notice. | Kevin Serrano | 2017-05-09 | 3 | -2/+10 |
| | | |||||
* | | Merge pull request #1382 from MetaMask/i1381-GasPriceInGwei | Kevin Serrano | 2017-05-09 | 5 | -12/+24 |
|\ \ | |/ |/| | Set gas price in gwei | ||||
| * | Changelog bump | Kevin Serrano | 2017-05-09 | 1 | -0/+1 |
| | | |||||
| * | Redefine txmeta when submitting. | Kevin Serrano | 2017-05-09 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'i1381-GasPriceInGwei' of github.com:MetaMask/metamask-plugin ↵ | Kevin Serrano | 2017-05-09 | 5 | -11/+22 |
|/| | | | | | | | into i1381-GasPriceInGwei | ||||
| * | Cleanup | Dan Finlay | 2017-05-09 | 1 | -2/+2 |
| | | |||||
| * | Add changelog entry for 1390 | Dan Finlay | 2017-05-09 | 1 | -0/+1 |
| | | |||||
| * | fix block polling changelog note | Dan Finlay | 2017-05-09 | 1 | -1/+1 |
| | | |||||
| * | Linted | Dan Finlay | 2017-05-09 | 1 | -1/+1 |
| | | |||||
| * | Run install before dist | Dan Finlay | 2017-05-09 | 1 | -1/+1 |
| | | |||||
| * | Bump changelog | Dan Finlay | 2017-05-08 | 1 | -0/+3 |
| | | |||||
| * | Input gas in gwei | Dan Finlay | 2017-05-08 | 1 | -7/+14 |
| | | | | | | | | | | | | | | Also enforces "safe low gas" minimum recommended by this article by eth-gas-station: https://medium.com/@ethgasstation/the-safe-low-gas-price-fb44fdc85b91 Fixes #1381 | ||||
| * | Fix ens iterated element without key error | Dan Finlay | 2017-05-08 | 1 | -0/+1 |
| | | |||||
| * | Fix changelog formatting | Dan Finlay | 2017-05-08 | 1 | -2/+0 |
| | | |||||
| * | allow copy(logState()) to copy to clipboard | Dan Finlay | 2017-05-08 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #1390 from MetaMask/ui-slim | Dan Finlay | 2017-05-09 | 4 | -5/+6 |
|\ \ | | | | | | | Slim down the ui bundle a bit | ||||
| * | | deps - bump eth-query for smaller bundle size | kumavis | 2017-05-09 | 1 | -1/+1 |
| | | | |||||
| * | | ui - remove web3, use eth-query | kumavis | 2017-05-09 | 3 | -4/+5 |
| | | | |||||
* | | | Merge pull request #1391 from MetaMask/gulp-disc | Dan Finlay | 2017-05-09 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | build - fix disc task | ||||
| * | | build - fix disc task | kumavis | 2017-05-09 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1378 from MetaMask/accounts-when-locked | Kevin Serrano | 2017-05-06 | 1 | -14/+16 |
|\ \ | | | | | | | metamask - selected accounts - dont reveal when locked | ||||
| * | | metamask - publicConfig - fix init state | kumavis | 2017-05-05 | 1 | -1/+1 |
| | | | |||||
| * | | metamask - selected accounts - dont reveal when locked | kumavis | 2017-05-05 | 1 | -15/+17 |
| | | | |||||
* | | | Merge pull request #1376 from MetaMask/1061-Linting-Tests | kumavis | 2017-05-05 | 34 | -484/+428 |
|\ \ \ | |/ / |/| | | 1061 linting tests | ||||
| * | | Whoops missed some modules | Thomas Huang | 2017-05-05 | 4 | -8/+0 |
| | | | |||||
| * | | Remove unused modules and STORAGE_KEY | Thomas Huang | 2017-05-05 | 6 | -14/+0 |
| | | | |||||
| * | | Lint tests | Thomas Huang | 2017-05-05 | 32 | -482/+439 |
| | | | |||||
| * | | Add Mocha/Chai eslint plugins | Thomas Huang | 2017-05-05 | 1 | -0/+2 |
| | | | |||||
| * | | Ignore tests bundle, jquery, abd helpers | Thomas Huang | 2017-05-05 | 1 | -0/+4 |
| | | | |||||
| * | | Add mocha and chai plugins eslint | Thomas Huang | 2017-05-05 | 1 | -1/+4 |
| |/ | |||||
* | | Merge pull request #1369 from MetaMask/foxrevert | kumavis | 2017-05-05 | 2 | -7/+7 |
|\ \ | |/ |/| | Revert the fox animation | ||||
| * | Minor lint | Kevin Serrano | 2017-05-03 | 1 | -1/+1 |
| | | |||||
| * | Fox watches over us again. | Kevin Serrano | 2017-05-03 | 1 | -6/+6 |
|/ | |||||
* | Merge pull request #1360 from MetaMask/flyswatter-patch-1 | Kevin Serrano | 2017-05-02 | 1 | -2/+3 |
|\ | | | | | Correct change dates | ||||
| * | Merge branch 'master' into flyswatter-patch-1 | Kevin Serrano | 2017-05-02 | 2 | -6/+9 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1362 from MetaMask/FoxLookAway | Kevin Serrano | 2017-05-02 | 2 | -6/+8 |
|\ \ | | | | | | | Make fox look away while typing password | ||||
| * | | Bump changelog | Dan Finlay | 2017-05-01 | 1 | -0/+2 |
| | | | |||||
| * | | Adjust fox look height | Dan Finlay | 2017-05-01 | 1 | -1/+1 |
| | | | |||||
| * | | Make fox look away while typing password | Dan Finlay | 2017-05-01 | 1 | -6/+6 |
|/ / | | | | | | | | | Inspired by this tweet: https://twitter.com/Aashay/status/858791285976481792 | ||||
| * | Correct change dates | Dan Finlay | 2017-05-01 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #1359 from MetaMask/FixBlockPollingv3.6.1 | Dan Finlay | 2017-05-01 | 4 | -11/+8 |
|\ | | | | | Fix block polling | ||||
| * | Version 3.6.1 | Dan Finlay | 2017-05-01 | 2 | -1/+4 |
| | | |||||
| * | Use loglevel for more logs | Dan Finlay | 2017-05-01 | 1 | -9/+3 |
| | | |||||
| * | Bump provider engine | Dan Finlay | 2017-05-01 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #1358 from MetaMask/kumavis-patch-1 | Dan Finlay | 2017-04-29 | 2 | -3/+2 |
|\ | | | | | notification-manager - remove promise listener | ||||
| * | Update CHANGELOG.md | kumavis | 2017-04-29 | 1 | -0/+2 |
| | | |||||
| * | notification-manager - remove promise listener | kumavis | 2017-04-29 | 1 | -3/+0 |
|/ | | | | | | | | seems chrome changed their API? MDN suggests that a Promise should be returned but getting `undefined` https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/windows/create Chrome docs suggest its a callback API lolwut https://developer.chrome.com/extensions/windows#method-create | ||||
* | Merge pull request #1356 from MetaMask/mascaraTuneUps | kumavis | 2017-04-29 | 15 | -84/+281 |
|\ | | | | | Mascara tune ups | ||||
| * | clean up code | frankiebee | 2017-04-29 | 3 | -5/+3 |
| | | |||||
| * | General cleanup and window reload if an update is found | frankiebee | 2017-04-28 | 4 | -12/+17 |
| | | |||||
| * | break out IndexDbController && Run the first time test on mascara | frankiebee | 2017-04-28 | 9 | -81/+47 |
| | | |||||
| * | Setup test enviroment for mascara | frankiebee | 2017-04-28 | 10 | -1/+236 |
| | | |||||
| * | Update README for mascara | frankiebee | 2017-04-27 | 2 | -12/+5 |
| | | |||||
| * | bump client-sw-ready-event | frankiebee | 2017-04-27 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1343 from MetaMask/Version-3.5.4v3.6.0Version-3.6.0 | Thomas Huang | 2017-04-28 | 2 | -2/+7 |
|\ \ | | | | | | | Version 3.6.0 | ||||
| * | | Version 3.6.0 | Dan Finlay | 2017-04-28 | 2 | -2/+5 |
| | | | | | | | | | | | | t # Explicit paths specified without -i or -o; assuming --only paths... | ||||
| * | | Merge branch 'master' into Version-3.5.4 | Dan Finlay | 2017-04-28 | 54 | -140/+209 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #1352 from MetaMask/rinkeby | Thomas Huang | 2017-04-28 | 14 | -2/+84 |
|\ \ \ | | | | | | | | | Rinkeby | ||||
| * \ \ | Merge branch 'master' into rinkeby | Dan Finlay | 2017-04-28 | 43 | -137/+124 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #1351 from MetaMask/lint | Dan Finlay | 2017-04-28 | 41 | -135/+124 |
|\ \ \ \ | | | | | | | | | | | Fix linting warnings | ||||
| * | | | | Fix linting warnings | Thomas Huang | 2017-04-27 | 41 | -135/+124 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1347 from MetaMask/gulp-fail-fix | Dan Finlay | 2017-04-28 | 1 | -2/+0 |
|\ \ \ \ | | | | | | | | | | | build - make gulp return non-zero error code on bundle fail | ||||
| * | | | | build - make gulp return non-zero error code on bundle fail | kumavis | 2017-04-26 | 1 | -2/+0 |
| |/ / / | |||||
* | | | | Merge pull request #1345 from MetaMask/docker-node7 | Dan Finlay | 2017-04-28 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | mascara - docker - bump to node7 | ||||
| * | | | mascara - docker - bump to node7 | kumavis | 2017-04-26 | 1 | -1/+1 |
| | | | | |||||
| | * | | Add to changelog. | Kevin Serrano | 2017-04-26 | 1 | -0/+1 |
| | | | | |||||
| | * | | Add (vague) instructions to adding a new network to the dropdown. | Kevin Serrano | 2017-04-26 | 1 | -0/+25 |
| | | | | |||||
| | * | | Linting. | Kevin Serrano | 2017-04-26 | 2 | -2/+2 |
| | | | | |||||
| | * | | Add missing changes. Create unique style for rinkeby icon. | Kevin Serrano | 2017-04-26 | 9 | -6/+26 |
| | | | | |||||
| | * | | change network name to rinkeby when selected | Nickyg | 2017-04-26 | 1 | -1/+10 |
| | | | | |||||
| | * | | add rinkeby network | Nickyg | 2017-04-26 | 6 | -1/+28 |
| |/ / |/| | | |||||
| | * | Version 3.5.4v3.5.4 | Dan Finlay | 2017-04-26 | 2 | -1/+3 |
| |/ |/| | |||||
* | | Merge pull request #1342 from MetaMask/AllowBigSignatureV | kumavis | 2017-04-26 | 2 | -1/+2 |
|\ \ | | | | | | | Allow signature V values over 1 byte | ||||
| * | | Allow signature V values over 1 byte | Dan Finlay | 2017-04-26 | 2 | -1/+2 |
|/ / | | | | | | | By bumping ethereumjs-tx. | ||||
* | | Merge pull request #1339 from MetaMask/BumpProviderEngine | Kevin Serrano | 2017-04-25 | 2 | -1/+4 |
|\ \ | | | | | | | Bump provider engine | ||||
| * | | Bump provider-engine | Dan Finlay | 2017-04-25 | 1 | -1/+1 |
| | | | |||||
| * | | Bump provider engine | Dan Finlay | 2017-04-25 | 2 | -1/+4 |
|/ / | | | | | | | Should now pass test suite, and include several sweet recent fixes! | ||||
* | | Merge pull request #1338 from MetaMask/Version-3.5.3 | kumavis | 2017-04-25 | 2 | -1/+5 |
|\ \ | | | | | | | Version 3.5.3 | ||||
| * | | Version 3.5.3v3.5.3 | Dan Finlay | 2017-04-25 | 2 | -1/+5 |
|/ / | |||||
* | | Merge pull request #1336 from MetaMask/buyButtonRedo | Dan Finlay | 2017-04-25 | 10 | -244/+216 |
|\ \ | |/ |/| | Buy button redo | ||||
| * | fix spelling | frankiebee | 2017-04-25 | 2 | -4/+4 |
| | | |||||
| * | Css fixes | frankiebee | 2017-04-24 | 2 | -7/+9 |
| | | |||||
| * | make buy button green | frankiebee | 2017-04-24 | 1 | -1/+1 |
| | | |||||
| * | Fix issue where stopPropagation didnt stop submitting the tx when clicking ↵ | frankiebee | 2017-04-24 | 1 | -1/+1 |
| | | | | | | | | buy button | ||||
| * | Merge pull request #1335 from MetaMask/buyButtonRedoCleanUp | Frankie | 2017-04-24 | 5 | -70/+1 |
| |\ | | | | | | | Buy button redo clean up | ||||
| | * | remove updateCoinBaseAmount action | Jared Pereira | 2017-04-24 | 3 | -25/+0 |
| | | | |||||
| | * | remove updateBuyAddress action | Jared Pereira | 2017-04-24 | 4 | -29/+1 |
| | | | |||||
| | * | remove case buyForm | Jared Pereira | 2017-04-23 | 1 | -3/+0 |
| | | | |||||
| | * | remove buyButtonDeligator function | Jared Pereira | 2017-04-23 | 1 | -12/+0 |
| | | | |||||
| | * | remove extra buyAddress in state | Jared Pereira | 2017-04-23 | 1 | -1/+0 |
| |/ | |||||
| * | Initial redo attempt of the buy view to look like vladt's desighn | frankiebee | 2017-04-19 | 6 | -195/+173 |
| | | |||||
| * | Create a custom radio list component | frankiebee | 2017-04-19 | 1 | -0/+61 |
| | | |||||
* | | Merge pull request #1331 from MetaMask/i1323-kovanNoticeRemoval | Dan Finlay | 2017-04-25 | 3 | -2/+5 |
|\ \ | | | | | | | Kovan notice removal | ||||
| * | | Add more detailed instructions on generating and deleting notices. | Kevin Serrano | 2017-04-18 | 1 | -0/+4 |
| | | | |||||
| * | | Remove kovan notice. | Kevin Serrano | 2017-04-18 | 2 | -2/+1 |
| |/ | |||||
* | | Merge pull request #1333 from MetaMask/firefoxIDB | kumavis | 2017-04-22 | 2 | -57/+40 |
|\ \ | |/ |/| | Fix for Firefox idb | ||||
| * | Clean up code | frankiebee | 2017-04-22 | 1 | -14/+13 |
| | | |||||
| * | Reduce wakeup time for firefox | frankiebee | 2017-04-21 | 1 | -1/+1 |
| | | |||||
| * | Fix for firefox | frankiebee | 2017-04-21 | 1 | -55/+39 |
|/ | |||||
* | Merge pull request #1313 from MetaMask/wakeUp2 | kumavis | 2017-04-07 | 3 | -5/+6 |
|\ | | | | | Wake up2 | ||||
| * | fix syntax | frankiebee | 2017-04-07 | 1 | -1/+1 |
| | | |||||
| * | uncomment intervalDelay | frankiebee | 2017-04-07 | 1 | -1/+1 |
| | | |||||
| * | match intervals | frankiebee | 2017-04-07 | 1 | -1/+2 |
| | | |||||
| * | Fix wakeUps: | frankiebee | 2017-04-07 | 3 | -6/+6 |
| | | | | | | | | | | fix spelling cut wakeup time in half | ||||
* | | Merge pull request #1312 from MetaMask/WakeUp | kumavis | 2017-04-07 | 3 | -2/+8 |
|\| | | | | | Wake up | ||||
| * | Bump sw-client version | frankiebee | 2017-04-07 | 1 | -1/+1 |
| | | |||||
| * | remove unnecessary listner | frankiebee | 2017-04-07 | 1 | -6/+1 |
| | | |||||
| * | Ping service worker to keep it from going idle | frankiebee | 2017-04-07 | 3 | -3/+14 |
|/ | |||||
* | Merge pull request #1311 from MetaMask/mascara-publish | Frankie | 2017-04-06 | 6 | -21/+56 |
|\ | | | | | Mascara - docker support | ||||
| * | mascara - ready to deploy via docker | kumavis | 2017-04-06 | 4 | -4/+40 |
| | | |||||
| * | mascara - mascara lib - read mascara origin from env var | kumavis | 2017-04-06 | 1 | -17/+14 |
| | | |||||
| * | build - add envify to bundle process | kumavis | 2017-04-06 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #1310 from MetaMask/account-transition-fix | kumavis | 2017-04-06 | 3 | -2/+3 |
|\ \ | |/ |/| | Account transition fix | ||||
| * | Changelog. | Kevin Serrano | 2017-04-06 | 1 | -0/+1 |
| | | |||||
| * | Fix account detail transition fix. | Kevin Serrano | 2017-04-06 | 2 | -2/+2 |
|/ | |||||
* | Merge pull request #1309 from MetaMask/mascara2 | Frankie | 2017-04-05 | 22 | -150/+236 |
|\ | | | | | Mascara - various fixes | ||||
| * | mascara - rename popup to ui | kumavis | 2017-04-05 | 2 | -3/+3 |
| | | |||||
| * | mascara - rename things + break out mascara asset server | kumavis | 2017-04-05 | 11 | -114/+135 |
| | | |||||
| * | clean - remove unused extension ref | kumavis | 2017-04-05 | 1 | -3/+2 |
| | | |||||
| * | auto-faucet - only skip faucet on explicit test environment | kumavis | 2017-04-05 | 1 | -1/+1 |
| | | |||||
| * | add platforms to mascara + move buyEther window open to ui | kumavis | 2017-04-05 | 10 | -31/+97 |
|/ | |||||
* | Merge pull request #1307 from MetaMask/mascara | kumavis | 2017-04-05 | 18 | -220/+328 |
|\ | | | | | Proof of Concept: Mascara | ||||
| * | clean - metamask controller - remove log | kumavis | 2017-04-05 | 1 | -1/+0 |
| | | |||||
| * | Remove out of date comments | frankiebee | 2017-04-04 | 1 | -9/+1 |
| | | |||||
| * | Fix first install flow | frankiebee | 2017-04-04 | 2 | -11/+4 |
| | | |||||
| * | Update todos on README | frankiebee | 2017-04-03 | 1 | -0/+4 |
| | | |||||
| * | Update MetaMascara README | frankiebee | 2017-04-03 | 1 | -11/+3 |
| | | |||||
| * | Rename mascara root directory | frankiebee | 2017-04-03 | 12 | -0/+0 |
| | | |||||
| * | Check to see if connection is from popup | frankiebee | 2017-04-03 | 1 | -1/+1 |
| | | |||||
| * | Make Popup close after approving a transaction | frankiebee | 2017-04-03 | 1 | -7/+14 |
| | | |||||
| * | Merge branch 'master' into mascara | frankiebee | 2017-04-03 | 19 | -334/+213 |
| |\ | |||||
| * \ | Merge branch 'master' into mascara | frankiebee | 2017-04-03 | 15 | -82/+197 |
| |\ \ | |||||
| * | | | Rename and move around files | frankiebee | 2017-04-03 | 11 | -110/+21 |
| | | | | |||||
| * | | | Clean up | frankiebee | 2017-03-31 | 6 | -181/+11 |
| | | | | |||||
| * | | | fix stream | frankiebee | 2017-03-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Bump sw-stream and setup "untrusted and trusted comunication" | frankiebee | 2017-03-30 | 4 | -6/+12 |
| | | | | |||||
| * | | | Create a Transaction from within the dapp | frankiebee | 2017-03-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | WIP: lost enital call from dapp to getAccounts | frankiebee | 2017-03-30 | 8 | -24/+14 |
| | | | | |||||
| * | | | Merge branch 'master' into mascara | frankiebee | 2017-03-29 | 33 | -593/+720 |
| |\ \ \ | |||||
| * | | | | WIP: Untrusted external connections eg: dapps | frankiebee | 2017-03-29 | 9 | -54/+221 |
| | | | | | |||||
| * | | | | add versioning and migrateing data | frankiebee | 2017-03-24 | 2 | -51/+28 |
| | | | | | |||||
| * | | | | Merge branch 'master' into mascara | frankiebee | 2017-03-24 | 67 | -1037/+573 |
| |\ \ \ \ | |||||
| * | | | | | Fix state persistence | frankiebee | 2017-03-24 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Clean up messy merge | frankiebee | 2017-03-24 | 1 | -11/+2 |
| | | | | | | |||||
| * | | | | | Merge branch 'mascaraMix' into mascara | frankiebee | 2017-03-24 | 2 | -23/+12 |
| |\ \ \ \ \ | |||||
| | * | | | | | Get mascara to send a transaction in the ui | frankiebee | 2017-03-24 | 5 | -18/+11 |
| | | | | | | | |||||
| * | | | | | | WIP: indexdb is at an err state "provider is undefined" | frankiebee | 2017-03-24 | 5 | -13/+26 |
| |/ / / / / | |||||
| * | | | | | WIP: streams->indexdb | frankiebee | 2017-03-24 | 10 | -54/+96 |
| | | | | | | |||||
| * | | | | | WIP:stream | frankiebee | 2017-03-22 | 3 | -12/+13 |
| | | | | | | |||||
| * | | | | | notes and clean up | frankiebee | 2017-03-10 | 3 | -179/+7 |
| | | | | | | |||||
| * | | | | | put background in service worker | frankiebee | 2017-03-10 | 7 | -2/+378 |
| | | | | | | |||||
* | | | | | | Merge pull request #1308 from MetaMask/FixFaucet | Kevin Serrano | 2017-04-05 | 2 | -0/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix faucet to only autoFaucet first account | ||||
| * | | | | | | Fix faucet to only autoFaucet first account | frankiebee | 2017-04-05 | 2 | -0/+3 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #1306 from MetaMask/redoAutoFaucetAsFetch | Kevin Serrano | 2017-04-05 | 1 | -5/+11 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Switch auto-faucet from XMLHttpRequest to fetch | ||||
| * | | | | | Switch auto-faucet from XMLHttpRequest to fetch | frankiebee | 2017-04-04 | 1 | -5/+11 |
|/ / / / / | |||||
* | | | | | Merge pull request #1300 from MetaMask/platform | Frankie | 2017-04-03 | 19 | -334/+213 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Introduce Platform API | ||||
| * | | | | notification-manager - rename show -> showPoup + make getPopup private | kumavis | 2017-04-01 | 2 | -11/+11 |
| | | | | | |||||
| * | | | | ui - use global.platform for extension interaction | kumavis | 2017-04-01 | 6 | -22/+21 |
| | | | | | |||||
| * | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into platform | kumavis | 2017-04-01 | 5 | -50/+101 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #1297 from MetaMask/eip155 | Dan Finlay | 2017-04-01 | 4 | -35/+83 |
|\ \ \ \ \ | | | | | | | | | | | | | tx-manager - add eip155 support | ||||
| * | | | | | tests - tx-manager - fix assert and clean formatting | kumavis | 2017-03-31 | 2 | -10/+2 |
| | | | | | | |||||
| * | | | | | tx-manager - add eip155 support | kumavis | 2017-03-31 | 3 | -35/+91 |
| | | | | | | |||||
* | | | | | | Merge pull request #1299 from MetaMask/test-notice-fix | Dan Finlay | 2017-04-01 | 1 | -15/+18 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | test - fix notice-controller test | ||||
| * | | | | | | test - fix notice-controller test | kumavis | 2017-03-31 | 1 | -15/+18 |
|/ / / / / / | |||||
| | * | | | | ui - move popup auto-close after tx conf to ui entrypoint | kumavis | 2017-04-01 | 2 | -6/+9 |
| | | | | | | |||||
| | * | | | | ui - startPopup returns store after boot | kumavis | 2017-04-01 | 4 | -39/+46 |
| | | | | | | |||||
| | * | | | | ui - reducer - app - code cleanup | kumavis | 2017-04-01 | 1 | -27/+20 |
| | | | | | | |||||
| | * | | | | etc - fix notification-manager ref, remove duplicated test file | kumavis | 2017-03-31 | 2 | -79/+4 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into platform | kumavis | 2017-03-31 | 1 | -1/+1 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #1298 from MetaMask/tests-fix | Frankie | 2017-03-31 | 3 | -10/+54 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Test Framework Fix | ||||
| * | | | | | tests - add missing done | kumavis | 2017-03-31 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | extension - remove local extension files, we use extensionizer | kumavis | 2017-03-31 | 2 | -85/+0 |
| | | | | | | |||||
| | * | | | | introduce platform api and rename notifications to notification-manager | kumavis | 2017-03-31 | 7 | -80/+117 |
| | | | | | | |||||
| | * | | | | extension - prefer extensionizer module | kumavis | 2017-03-31 | 7 | -7/+7 |
| |/ / / / | |||||
| * | | | | meta - package.json - rename npm test scripts | kumavis | 2017-03-31 | 1 | -5/+5 |
| | | | | | |||||
| * | | | | tests - helper - add note | kumavis | 2017-03-31 | 1 | -9/+11 |
| | | | | | |||||
| * | | | | tests - unit - fail on unhandled promise rejection | kumavis | 2017-03-31 | 2 | -4/+46 |
|/ / / / | |||||
* | | | | Merge pull request #1288 from MetaMask/i1285-FixFirefoxCurrencyChecks | Kevin Serrano | 2017-03-30 | 1 | -1/+2 |
|\ \ \ \ | | | | | | | | | | | Fix currency checking for firefox | ||||
| * | | | | Fix currency checking for firefox | Dan Finlay | 2017-03-30 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By adding cryptonator to our permitted CORS hosts. Fixes #1285. Will probably trigger additional permissions requests to our users. | ||||
* | | | | | Merge pull request #1293 from MetaMask/ImproveGasEstimates | Kevin Serrano | 2017-03-30 | 2 | -14/+21 |
|\ \ \ \ \ | | | | | | | | | | | | | tx-utils - gas buffer ceiling at 90% of block gas limit | ||||
| * | | | | | tests - tx-utils gasBuffer calc - fix bug and user easier numbers | kumavis | 2017-03-30 | 1 | -11/+17 |
| | | | | | | |||||
| * | | | | | tx-utils - gas buffer ceiling at 90% of block gas limit | kumavis | 2017-03-30 | 1 | -3/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #1287 from MetaMask/kumavis-patch-1 | Dan Finlay | 2017-03-30 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | deps - bump provider-engine | ||||
| * | | | | | deps - bump provider-engine | kumavis | 2017-03-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | uses fetch instead of xhr, fixes a race condition in cache subp | ||||
* | | | | | | Merge pull request #1283 from MetaMask/i1267-textfix | kumavis | 2017-03-30 | 2 | -4/+8 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix potential formatting issues for seed word display. | ||||
| * | | | | | Fix potential formatting issues for seed word display. | Kevin Serrano | 2017-03-29 | 2 | -4/+8 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #1284 from MetaMask/FixFirefoxPopup | kumavis | 2017-03-30 | 3 | -2/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix firefox popup | ||||
| * | | | | | Linted | Dan Finlay | 2017-03-30 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Bump changelog | Dan Finlay | 2017-03-30 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Fix popup behavior for Firefox | Dan Finlay | 2017-03-30 | 2 | -2/+7 |
|/ / / / / | | | | | | | | | | | | | | | | Firefox does not support the `focused` parameter when opening a new window, and we don't actually require it for Chrome either, new popups are at the foreground by default already. | ||||
* | | | | | Merge pull request #1281 from MetaMask/migration-enable | Dan Finlay | 2017-03-29 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | Add missing migration. | ||||
| * | | | | Add missing migration. | Kevin Serrano | 2017-03-29 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Merge pull request #1277 from MetaMask/Version-2.5.2 | Dan Finlay | 2017-03-29 | 2 | -1/+4 |
|\ \ \ \ | | | | | | | | | | | Version 2.5.2 | ||||
| * | | | | Version 2.5.2v3.5.2v2.5.2 | Dan Finlay | 2017-03-29 | 2 | -1/+4 |
|/ / / / | |||||
* | | | | Merge pull request #1268 from MetaMask/kovan-faucet-instructions | Dan Finlay | 2017-03-29 | 3 | -2/+14 |
|\ \ \ \ | | | | | | | | | | | Add Kovan faucet instructions | ||||
| * \ \ \ | Merge branch 'master' into kovan-faucet-instructions | Dan Finlay | 2017-03-29 | 12 | -177/+108 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into kovan-faucet-instructions | Kevin Serrano | 2017-03-28 | 3 | -1/+8 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add to changelog. | Kevin Serrano | 2017-03-28 | 1 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | Add link to kovan faucet instructions. | Kevin Serrano | 2017-03-28 | 2 | -2/+13 |
| | | | | | | |