Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into i1412-decimalizethegas | Kevin Serrano | 2017-05-25 | 14 | -124/+373 |
|\ | |||||
| * | Merge pull request #1481 from MetaMask/Version-3.7.0 | kumavis | 2017-05-25 | 1 | -1/+1 |
| |\ | |||||
| | * | Update announcer wording | Dan Finlay | 2017-05-24 | 1 | -1/+1 |
| * | | Merge pull request #1487 from MetaMask/stopPolling | kumavis | 2017-05-25 | 2 | -2/+6 |
| |\ \ | |||||
| | * | | clean up test | frankiebee | 2017-05-24 | 1 | -2/+1 |
| | * | | stop polling when switching networks | frankiebee | 2017-05-24 | 2 | -1/+6 |
| * | | | Merge pull request #1486 from MetaMask/Version-3.7.1 | kumavis | 2017-05-24 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Merge branch 'master' into Version-3.7.1 | kumavis | 2017-05-24 | 16 | -134/+422 |
| | |\ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #1455 from MetaMask/networkController | kumavis | 2017-05-24 | 12 | -118/+309 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' into networkController | Frankie | 2017-05-24 | 7 | -17/+114 |
| | |\ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #1480 from MetaMask/Version-3.7.0 | kumavis | 2017-05-24 | 3 | -3/+6 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Version 3.7.0v3.7.0 | Dan Finlay | 2017-05-24 | 2 | -1/+3 |
| | * | | | Cleanup | Dan Finlay | 2017-05-24 | 1 | -2/+3 |
| |/ / / | |||||
| * | | | Merge pull request #1478 from MetaMask/i1409-StalledTxs | Thomas Huang | 2017-05-24 | 2 | -2/+53 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' into i1409-StalledTxs | Dan Finlay | 2017-05-24 | 2 | -1/+2 |
| | |\ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Continually resubmit pending txs | Dan Finlay | 2017-05-24 | 2 | -2/+53 |
| | | * | | add to CHANGELOG | frankiebee | 2017-05-24 | 1 | -0/+2 |
| | | * | | include ethQuery in txController | frankiebee | 2017-05-24 | 1 | -0/+1 |
| | | * | | Fix for tests | frankiebee | 2017-05-24 | 8 | -57/+150 |
| | | * | | Wrap the provider in a proxy | frankiebee | 2017-05-23 | 5 | -126/+64 |
| | | * | | Add a migration for the network controller | frankiebee | 2017-05-23 | 2 | -0/+35 |
| | | * | | Merge branch 'master' into networkController | frankiebee | 2017-05-23 | 43 | -5965/+823 |
| | | |\ \ | |||||
| | | * | | | Create a network controller to manage switcing networks an updating the provider | frankiebee | 2017-05-19 | 6 | -150/+232 |
| | | | | * | Version 3.7.1v3.7.1 | Dan Finlay | 2017-05-24 | 1 | -1/+1 |
* | | | | | | Cleanup code. | Kevin Serrano | 2017-05-25 | 1 | -7/+15 |
* | | | | | | Fix test, create new value for precision/scale | Kevin Serrano | 2017-05-24 | 3 | -5/+8 |
* | | | | | | Merge branch 'master' into i1412-decimalizethegas | Kevin Serrano | 2017-05-24 | 7 | -14/+60 |
|\| | | | | | |||||
| * | | | | | Merge pull request #1475 from MetaMask/i1427-ThrowIfResolverNotSet | Frankie | 2017-05-24 | 2 | -1/+2 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Throw if ENS Resolver isn't set up | Dan Finlay | 2017-05-23 | 2 | -1/+2 |
| |/ / / / | |||||
| * | | | | Merge pull request #1468 from MetaMask/HelpDebugStalledTxs | Dan Finlay | 2017-05-23 | 4 | -5/+33 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into HelpDebugStalledTxs | kumavis | 2017-05-23 | 3 | -6/+19 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge pull request #1474 from MetaMask/i1458-StreamingSubprovider | kumavis | 2017-05-23 | 3 | -6/+20 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | clean - remove console logs | kumavis | 2017-05-23 | 1 | -2/+0 |
| | * | | | | deps - use stream-subprovider from provider-engine | kumavis | 2017-05-23 | 3 | -5/+5 |
| | * | | | | Rename stream to streamSubprovider | Dan Finlay | 2017-05-23 | 1 | -4/+4 |
| | * | | | | Bump changelog | Dan Finlay | 2017-05-23 | 1 | -0/+2 |
| | * | | | | Use filter subprovider in-page to avoid filter leaks | Dan Finlay | 2017-05-23 | 2 | -3/+7 |
| | * | | | | Use stream-provider v3 api | Dan Finlay | 2017-05-23 | 1 | -2/+2 |
| | * | | | | Add new streaming subprovider but getting a loop | Dan Finlay | 2017-05-21 | 1 | -5/+15 |
| |/ / / / | |||||
| | * | | | Tolerate nonces of any format | Dan Finlay | 2017-05-23 | 2 | -2/+3 |
| | * | | | Render txs with no nonce | Dan Finlay | 2017-05-23 | 1 | -1/+1 |
| | * | | | Lint | Dan Finlay | 2017-05-22 | 2 | -6/+3 |
| | * | | | Label the pending tx icon with a tooltip | Dan Finlay | 2017-05-22 | 2 | -5/+13 |
| | * | | | Add transaction number (nonce) to tx list | Dan Finlay | 2017-05-22 | 2 | -0/+23 |
| |/ / / | |||||
| * | | | Merge pull request #1447 from MetaMask/Version-3.6.5 | Thomas Huang | 2017-05-18 | 2 | -1/+3 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Version 3.6.5v3.6.5 | Dan Finlay | 2017-05-18 | 2 | -1/+3 |
| |/ / | |||||
| * | | Merge pull request #1446 from MetaMask/DisallowDecimalsInHexInput | Dan Finlay | 2017-05-18 | 2 | -1/+2 |
| |\ \ | |||||
| | * | | Fix decimal tolerance | Dan Finlay | 2017-05-18 | 1 | -1/+1 |
| | * | | Fix bug where decimals in gas inputs gave strange results | Dan Finlay | 2017-05-18 | 2 | -1/+2 |
| |/ / | |||||
* | | | Increase accuracy of our rounding schemes. | Kevin Serrano | 2017-05-24 | 1 | -3/+26 |
* | | | Modify test, replace clone package. | Kevin Serrano | 2017-05-18 | 2 | -9/+6 |
* | | | Merge branch 'i1412-decimalizethegas' of github.com:MetaMask/metamask-plugin ... | Kevin Serrano | 2017-05-18 | 2 | -1/+50 |
|\ \ \ | |||||
| * | | | Linted test | Dan Finlay | 2017-05-17 | 1 | -6/+4 |
| * | | | Clean up test | Dan Finlay | 2017-05-17 | 1 | -4/+1 |
| * | | | Simplify test to represent realistic use case | Dan Finlay | 2017-05-17 | 1 | -10/+6 |
| * | | | Merge branch 'master' into i1412-BrutalTests | Dan Finlay | 2017-05-17 | 5 | -21/+97 |
| |\| | | |||||
| * | | | Merge branch 'i1407-GasEditingBug' into i1412-BrutalTests | Dan Finlay | 2017-05-17 | 0 | -0/+0 |
| |\ \ \ | |||||
| | * | | | Rename tx manager to tx controller | Dan Finlay | 2017-05-17 | 3 | -70/+70 |
| * | | | | Add test requiring high precision | Dan Finlay | 2017-05-17 | 2 | -1/+60 |
* | | | | | Merge branch 'master' into i1412-decimalizethegas | Kevin Serrano | 2017-05-18 | 5 | -21/+98 |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | |||||
| * | | | Merge pull request #1441 from MetaMask/FixGasReset | kumavis | 2017-05-17 | 5 | -21/+98 |
| |\ \ \ | |||||
| | * | | | Fix bug where edited gas parameters did not take effect | Dan Finlay | 2017-05-17 | 2 | -1/+2 |
| | * | | | Add test around txManager#approveTransaction | Dan Finlay | 2017-05-17 | 1 | -3/+64 |
| | * | | | Improve test | Dan Finlay | 2017-05-17 | 1 | -1/+5 |
| | * | | | Linted | Dan Finlay | 2017-05-17 | 1 | -3/+2 |
| | * | | | Fix quotation mark | Dan Finlay | 2017-05-17 | 1 | -1/+1 |
| | * | | | Linted and removed unused deps | Dan Finlay | 2017-05-17 | 2 | -16/+8 |
| | * | | | Add gas updating test to tx controller tests | Dan Finlay | 2017-05-17 | 1 | -1/+21 |
| | * | | | Remove only line from test | Dan Finlay | 2017-05-17 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Fix merge conflicts. | Kevin Serrano | 2017-05-17 | 34 | -211/+424 |
|\| | | | |||||
| * | | | Merge pull request #1434 from MetaMask/mascara-scaling | Frankie | 2017-05-17 | 2 | -3/+13 |
| |\ \ \ | |||||
| | * | | | mascara - fix deploy instructions | kumavis | 2017-05-16 | 1 | -1/+1 |
| | * | | | mascara - ui - fix scale on mobile | kumavis | 2017-05-16 | 1 | -1/+2 |
| | * | | | mascara - add deploy instructions | kumavis | 2017-05-16 | 1 | -2/+11 |
| * | | | | Merge pull request #1438 from MetaMask/TxController | kumavis | 2017-05-17 | 4 | -74/+74 |
| |\ \ \ \ | |||||
| | * | | | | Fix path references | Dan Finlay | 2017-05-17 | 1 | -2/+2 |
| | * | | | | Rename tx manager to tx controller | Dan Finlay | 2017-05-17 | 4 | -72/+72 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge pull request #1440 from MetaMask/i1439-FixFiatFormatting | kumavis | 2017-05-17 | 10 | -18/+35 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Fix fiat rendering | Dan Finlay | 2017-05-17 | 10 | -18/+35 |
| |/ / / | |||||
| * | | | Merge pull request #1436 from MetaMask/mig13 | Dan Finlay | 2017-05-17 | 4 | -1/+55 |
| |\ \ \ | |||||
| | * | | | migration 13 - change provider from testnet to ropsten | kumavis | 2017-05-16 | 3 | -0/+41 |
| | * | | | test - format test data 001 | kumavis | 2017-05-16 | 1 | -1/+14 |
| * | | | | Merge pull request #1430 from MetaMask/i1407-FixNonEditingTxForm | kumavis | 2017-05-16 | 16 | -79/+225 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | lint - mandatory dangle | kumavis | 2017-05-16 | 1 | -1/+1 |
| | * | | | 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 |
| | * | | | | 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 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | 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 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | 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 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | 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 |
| | |/ / / | |/| | | | |||||
* | | | | | Changelog bump | Kevin Serrano | 2017-05-17 | 1 | -0/+2 |
* | | | | | Fix reset button. | Kevin Serrano | 2017-05-17 | 2 | -8/+10 |
* | | | | | Complete transition into BN. | Kevin Serrano | 2017-05-17 | 2 | -13/+157 |
|/ / / / | |||||
* | | | | Merge pull request #1417 from MetaMask/fixMigrator2 | Dan Finlay | 2017-05-13 | 3 | -21/+55 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | 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 | Dan Finlay | 2017-05-13 | 3 | -3/+10 |
|/ / / / | |||||
* | | | | Merge pull request #1416 from MetaMask/i1389-lesscurrency | kumavis | 2017-05-12 | 3 | -5731/+209 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | 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.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 | 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.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.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. | Kevin Serrano | 2017-05-09 | 3 | -2/+10 |
* | | Merge pull request #1382 from MetaMask/i1381-GasPriceInGwei | Kevin Serrano | 2017-05-09 | 5 | -12/+24 |
|\ \ | |/ |/| | |||||
| * | 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 in... | Kevin Serrano | 2017-05-09 | 5 | -11/+22 |
|/| | |||||
| * | 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 |
| * | 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 |
|\ \ | |||||
| * | | 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 | 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 - 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 |
|\ \ \ | |/ / |/| | | |||||
| * | | 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 |
|\ \ | |/ |/| | |||||
| * | 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 |
|\ | |||||
| * | 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 |
|\ \ | |||||
| * | | 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 |
|/ / | |||||
| * | 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 |
|\ | |||||
| * | 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 |
|\ | |||||
| * | Update CHANGELOG.md | kumavis | 2017-04-29 | 1 | -0/+2 |
| * | notification-manager - remove promise listener | kumavis | 2017-04-29 | 1 | -3/+0 |
|/ | |||||
* | Merge pull request #1356 from MetaMask/mascaraTuneUps | kumavis | 2017-04-29 | 15 | -84/+281 |
|\ | |||||
| * | 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 | Dan Finlay | 2017-04-28 | 2 | -2/+5 |
| * | | 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 |
|\ \ \ | |||||
| * \ \ | 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 | 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 | 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 | 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 | Dan Finlay | 2017-04-26 | 2 | -1/+2 |
|/ / | |||||
* | | Merge pull request #1339 from MetaMask/BumpProviderEngine | Kevin Serrano | 2017-04-25 | 2 | -1/+4 |
|\ \ | |||||
| * | | Bump provider-engine | Dan Finlay | 2017-04-25 | 1 | -1/+1 |
| * | | Bump provider engine | Dan Finlay | 2017-04-25 | 2 | -1/+4 |
|/ / | |||||
* | | Merge pull request #1338 from MetaMask/Version-3.5.3 | kumavis | 2017-04-25 | 2 | -1/+5 |
|\ \ | |||||
| * | | 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 |
|\ \ | |/ |/| | |||||
| * | 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 bu... | frankiebee | 2017-04-24 | 1 | -1/+1 |
| * | Merge pull request #1335 from MetaMask/buyButtonRedoCleanUp | Frankie | 2017-04-24 | 5 | -70/+1 |
| |\ | |||||
| | * | 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 |
|\ \ | |||||
| * | | 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 |
|\ \ | |/ |/| | |||||
| * | 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 |
|\ | |||||
| * | 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 |
* | | Merge pull request #1312 from MetaMask/WakeUp | kumavis | 2017-04-07 | 3 | -2/+8 |
|\| | |||||
| * | 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 - 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 |
|\ \ | |/ |/| | |||||
| * | Changelog. | Kevin Serrano | 2017-04-06 | 1 | -0/+1 |