aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1491 from MetaMask/inpage-polling-fixDan Finlay2017-05-251-1/+2
|\
| * inpage-provider - disable polling after first blockkumavis2017-05-251-1/+2
|/
* Merge pull request #1443 from MetaMask/i1412-decimalizethegaskumavis2017-05-255-19/+254
|\
| * Minor cleanup of lintKevin Serrano2017-05-251-1/+0
| * Minor cleanupKevin Serrano2017-05-251-2/+2
| * Modfiy test to ether standards.Kevin Serrano2017-05-251-4/+4
| * Fix bug where submit was enabled when invalid params were filled out.Kevin Serrano2017-05-253-5/+12
| * Bump changelogKevin Serrano2017-05-251-0/+1
| * Merge branch 'master' into i1412-decimalizethegasKevin Serrano2017-05-2514-124/+373
| |\ | |/ |/|
* | Merge pull request #1481 from MetaMask/Version-3.7.0kumavis2017-05-251-1/+1
|\ \
| * | Update announcer wordingDan Finlay2017-05-241-1/+1
* | | Merge pull request #1487 from MetaMask/stopPollingkumavis2017-05-252-2/+6
|\ \ \
| * | | clean up testfrankiebee2017-05-241-2/+1
| * | | stop polling when switching networksfrankiebee2017-05-242-1/+6
* | | | Merge pull request #1486 from MetaMask/Version-3.7.1kumavis2017-05-241-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' into Version-3.7.1kumavis2017-05-2416-134/+422
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1455 from MetaMask/networkControllerkumavis2017-05-2412-118/+309
|\ \ \ \
| * \ \ \ Merge branch 'master' into networkControllerFrankie2017-05-247-17/+114
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1480 from MetaMask/Version-3.7.0kumavis2017-05-243-3/+6
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Version 3.7.0v3.7.0Dan Finlay2017-05-242-1/+3
| * | | | CleanupDan Finlay2017-05-241-2/+3
|/ / / /
* | | | Merge pull request #1478 from MetaMask/i1409-StalledTxsThomas Huang2017-05-242-2/+53
|\ \ \ \
| * \ \ \ Merge branch 'master' into i1409-StalledTxsDan Finlay2017-05-242-1/+2
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | Continually resubmit pending txsDan Finlay2017-05-242-2/+53
| | * | | add to CHANGELOGfrankiebee2017-05-241-0/+2
| | * | | include ethQuery in txControllerfrankiebee2017-05-241-0/+1
| | * | | Fix for testsfrankiebee2017-05-248-57/+150
| | * | | Wrap the provider in a proxyfrankiebee2017-05-235-126/+64
| | * | | Add a migration for the network controllerfrankiebee2017-05-232-0/+35
| | * | | Merge branch 'master' into networkControllerfrankiebee2017-05-2343-5965/+823
| | |\ \ \
| | * | | | Create a network controller to manage switcing networks an updating the providerfrankiebee2017-05-196-150/+232
| | | | * | Version 3.7.1v3.7.1Dan Finlay2017-05-241-1/+1
| | | | | * Cleanup code.Kevin Serrano2017-05-251-7/+15
| | | | | * Fix test, create new value for precision/scaleKevin Serrano2017-05-243-5/+8
| | | | | * Merge branch 'master' into i1412-decimalizethegasKevin Serrano2017-05-247-14/+60
| | | | | |\ | |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #1475 from MetaMask/i1427-ThrowIfResolverNotSetFrankie2017-05-242-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Throw if ENS Resolver isn't set upDan Finlay2017-05-232-1/+2
|/ / / / /
* | | | | Merge pull request #1468 from MetaMask/HelpDebugStalledTxsDan Finlay2017-05-234-5/+33
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into HelpDebugStalledTxskumavis2017-05-233-6/+19
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #1474 from MetaMask/i1458-StreamingSubproviderkumavis2017-05-233-6/+20
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | clean - remove console logskumavis2017-05-231-2/+0
| * | | | | deps - use stream-subprovider from provider-enginekumavis2017-05-233-5/+5
| * | | | | Rename stream to streamSubproviderDan Finlay2017-05-231-4/+4
| * | | | | Bump changelogDan Finlay2017-05-231-0/+2
| * | | | | Use filter subprovider in-page to avoid filter leaksDan Finlay2017-05-232-3/+7
| * | | | | Use stream-provider v3 apiDan Finlay2017-05-231-2/+2
| * | | | | Add new streaming subprovider but getting a loopDan Finlay2017-05-211-5/+15
|/ / / / /
| * | | | Tolerate nonces of any formatDan Finlay2017-05-232-2/+3
| * | | | Render txs with no nonceDan Finlay2017-05-231-1/+1
| * | | | LintDan Finlay2017-05-222-6/+3
| * | | | Label the pending tx icon with a tooltipDan Finlay2017-05-222-5/+13
| * | | | Add transaction number (nonce) to tx listDan Finlay2017-05-222-0/+23
|/ / / /
* | | | Merge pull request #1447 from MetaMask/Version-3.6.5Thomas Huang2017-05-182-1/+3
|\ \ \ \ | | |/ / | |/| |
| * | | Version 3.6.5v3.6.5Dan Finlay2017-05-182-1/+3
|/ / /
* | | Merge pull request #1446 from MetaMask/DisallowDecimalsInHexInputDan Finlay2017-05-182-1/+2
|\ \ \
| * | | Fix decimal toleranceDan Finlay2017-05-181-1/+1
| * | | Fix bug where decimals in gas inputs gave strange resultsDan Finlay2017-05-182-1/+2
|/ / /
| | * Increase accuracy of our rounding schemes.Kevin Serrano2017-05-241-3/+26
| | * Modify test, replace clone package.Kevin Serrano2017-05-182-9/+6
| | * Merge branch 'i1412-decimalizethegas' of github.com:MetaMask/metamask-plugin ...Kevin Serrano2017-05-182-1/+50
| | |\
| | | * Linted testDan Finlay2017-05-171-6/+4
| | | * Clean up testDan Finlay2017-05-171-4/+1
| | | * Simplify test to represent realistic use caseDan Finlay2017-05-171-10/+6
| | | * Merge branch 'master' into i1412-BrutalTestsDan Finlay2017-05-175-21/+97
| | | |\ | |_|_|/ |/| | |
| | | * Merge branch 'i1407-GasEditingBug' into i1412-BrutalTestsDan Finlay2017-05-170-0/+0
| | | |\
| | | | * Rename tx manager to tx controllerDan Finlay2017-05-173-70/+70
| | | * | Add test requiring high precisionDan Finlay2017-05-172-1/+60
| | * | | Merge branch 'master' into i1412-decimalizethegasKevin Serrano2017-05-185-21/+98
| | |\ \ \ | |_|/ / / |/| | / / | | |/ /
* | | | Merge pull request #1441 from MetaMask/FixGasResetkumavis2017-05-175-21/+98
|\ \ \ \
| * | | | Fix bug where edited gas parameters did not take effectDan Finlay2017-05-172-1/+2
| * | | | Add test around txManager#approveTransactionDan Finlay2017-05-171-3/+64
| * | | | Improve testDan Finlay2017-05-171-1/+5
| * | | | LintedDan Finlay2017-05-171-3/+2
| * | | | Fix quotation markDan Finlay2017-05-171-1/+1
| * | | | Linted and removed unused depsDan Finlay2017-05-172-16/+8
| * | | | Add gas updating test to tx controller testsDan Finlay2017-05-171-1/+21
| * | | | Remove only line from testDan Finlay2017-05-171-1/+1
|/ / / /
| | * | Fix merge conflicts.Kevin Serrano2017-05-1734-211/+424
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #1434 from MetaMask/mascara-scalingFrankie2017-05-172-3/+13
|\ \ \ \
| * | | | mascara - fix deploy instructionskumavis2017-05-161-1/+1
| * | | | mascara - ui - fix scale on mobilekumavis2017-05-161-1/+2
| * | | | mascara - add deploy instructionskumavis2017-05-161-2/+11
* | | | | Merge pull request #1438 from MetaMask/TxControllerkumavis2017-05-174-74/+74
|\ \ \ \ \
| * | | | | Fix path referencesDan Finlay2017-05-171-2/+2
| * | | | | Rename tx manager to tx controllerDan Finlay2017-05-174-72/+72
| | |_|_|/ | |/| | |
* | | | | Merge pull request #1440 from MetaMask/i1439-FixFiatFormattingkumavis2017-05-1710-18/+35
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix fiat renderingDan Finlay2017-05-1710-18/+35
|/ / / /
* | | | Merge pull request #1436 from MetaMask/mig13Dan Finlay2017-05-174-1/+55
|\ \ \ \
| * | | | migration 13 - change provider from testnet to ropstenkumavis2017-05-163-0/+41
| * | | | test - format test data 001kumavis2017-05-161-1/+14
* | | | | Merge pull request #1430 from MetaMask/i1407-FixNonEditingTxFormkumavis2017-05-1616-79/+225
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | lint - mandatory danglekumavis2017-05-161-1/+1
| * | | | ui - send - clean props assignmentkumavis2017-05-161-8/+10
| * | | | Merge branch 'master' into i1407-FixNonEditingTxFormDan Finlay2017-05-168-5777/+282
| |\ \ \ \
| * | | | | Clean up testDan Finlay2017-05-161-14/+2
| * | | | | LintedDan Finlay2017-05-162-5/+6
| * | | | | Verify updating gas value updatesDan Finlay2017-05-162-5/+5
| * | | | | Got test failing nearly correctlyDan Finlay2017-05-163-15/+45
| * | | | | Skip jazzicons in unit testsDan Finlay2017-05-162-4/+11
| * | | | | Remove redux dependency from eth-balance and its dependent treeDan Finlay2017-05-1311-35/+49
| * | | | | Add support for async/awaitDan Finlay2017-05-133-3/+10
| * | | | | Got a useful error message for next stepDan Finlay2017-05-122-2/+23
| * | | | | Fix test up a bitDan Finlay2017-05-121-6/+4
| * | | | | Use react test utils to start composing testDan Finlay2017-05-122-6/+23
| * | | | | Got test failingDan Finlay2017-05-121-1/+3
| * | | | | Fix tests add logsDan Finlay2017-05-121-3/+7
| * | | | | Add an attempt at a unit test for reproducing #1407Dan Finlay2017-05-111-0/+61
| * | | | | Break up pending-tx component for better unit testabilityDan Finlay2017-05-111-38/+39
* | | | | | Merge pull request #1432 from MetaMask/i1419-rinkebydefaultnetworkkumavis2017-05-167-20/+12
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Remove all traces of testnetThomas Huang2017-05-167-22/+14
| * | | | | Merge branch 'master' into i1419-rinkebydefaultnetworkThomas Huang2017-05-163-26/+20
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #1431 from MetaMask/pe-bumpDan Finlay2017-05-162-1/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | changelog - add note on filter fixkumavis2017-05-161-0/+1
| * | | | | deps - bump provider-engine 12.0.6kumavis2017-05-161-1/+1
* | | | | | Merge pull request #1422 from MetaMask/drop-asyncqDan Finlay2017-05-162-25/+18
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add stage 0 support to build systemDan Finlay2017-05-161-2/+2
| * | | | | background - drop async-q in favor of async/awaitkumavis2017-05-132-23/+16
| | * | | | Change default network to rinkebyThomas Huang2017-05-165-15/+15
| |/ / / / |/| | | |
| | | | * Changelog bumpKevin Serrano2017-05-171-0/+2
| | | | * Fix reset button.Kevin Serrano2017-05-172-8/+10
| | | | * Complete transition into BN.Kevin Serrano2017-05-172-13/+157
| |_|_|/ |/| | |
* | | | Merge pull request #1417 from MetaMask/fixMigrator2Dan Finlay2017-05-133-21/+55
|\ \ \ \ | |/ / / |/| | |
| * | | ci - use node 7.6.0kumavis2017-05-131-1/+1
| * | | migrator - fix typokumavis2017-05-131-1/+1
| * | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into fixMigrator2kumavis2017-05-138-5742/+233
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1421 from MetaMask/es7kumavis2017-05-133-3/+10
|\ \ \ \
| * | | | Add support for async/awaitDan Finlay2017-05-133-3/+10
|/ / / /
* | | | Merge pull request #1416 from MetaMask/i1389-lesscurrencykumavis2017-05-123-5731/+209
|\ \ \ \ | |_|/ / |/| | |
| * | | Prettify JSONKevin Serrano2017-05-121-1/+207
| * | | Bump changelogKevin Serrano2017-05-121-0/+2
| * | | Trim currency list.Kevin Serrano2017-05-122-5731/+1
|/ / /
* | | Merge pull request #1404 from MetaMask/Version-3.6.4Thomas Huang2017-05-102-1/+5
|\ \ \
| * | | Version 3.6.4v3.6.4Dan Finlay2017-05-102-1/+5
|/ / /
* | | Merge pull request #1402 from MetaMask/ens-fixKevin Serrano2017-05-101-7/+9
|\ \ \ | |_|/ |/| |
| * | ens - add mainnet ens supportkumavis2017-05-101-7/+9
|/ /
| * migrator - cleaner migration runner with es7kumavis2017-05-121-25/+13
| * Create test for Migratorfrankiebee2017-05-121-0/+41
| * use asyncQ.waterfall instead of asyncQ.eachSeriesfrankiebee2017-05-121-4/+10
| * fix migratorfrankiebee2017-05-111-9/+8
|/
* Merge pull request #1397 from MetaMask/Version-3.6.3kumavis2017-05-092-1/+5
|\
| * Version 3.6.3v3.6.3Dan Finlay2017-05-092-1/+5
|/
* Merge pull request #1394 from MetaMask/Version-3.6.2Kevin Serrano2017-05-092-1/+3
|\
| * Version 3.6.2v3.6.2Dan Finlay2017-05-092-1/+3
|/
* Merge pull request #1393 from MetaMask/i1364-devwarning2Dan Finlay2017-05-093-2/+10
|\
| * Add new beta notice.Kevin Serrano2017-05-093-2/+10
* | Merge pull request #1382 from MetaMask/i1381-GasPriceInGweiKevin Serrano2017-05-095-12/+24
|\ \ | |/ |/|
| * Changelog bumpKevin Serrano2017-05-091-0/+1
| * Redefine txmeta when submitting.Kevin Serrano2017-05-091-1/+1
| * Merge branch 'i1381-GasPriceInGwei' of github.com:MetaMask/metamask-plugin in...Kevin Serrano2017-05-095-11/+22
|/|
| * CleanupDan Finlay2017-05-091-2/+2
| * Add changelog entry for 1390Dan Finlay2017-05-091-0/+1
| * fix block polling changelog noteDan Finlay2017-05-091-1/+1
| * LintedDan Finlay2017-05-091-1/+1
| * Run install before distDan Finlay2017-05-091-1/+1
| * Bump changelogDan Finlay2017-05-081-0/+3
| * Input gas in gweiDan Finlay2017-05-081-7/+14
| * Fix ens iterated element without key errorDan Finlay2017-05-081-0/+1
| * Fix changelog formattingDan Finlay2017-05-081-2/+0
| * allow copy(logState()) to copy to clipboardDan Finlay2017-05-081-0/+1
* | Merge pull request #1390 from MetaMask/ui-slimDan Finlay2017-05-094-5/+6
|\ \
| * | deps - bump eth-query for smaller bundle sizekumavis2017-05-091-1/+1
| * | ui - remove web3, use eth-querykumavis2017-05-093-4/+5
* | | Merge pull request #1391 from MetaMask/gulp-discDan Finlay2017-05-091-1/+1
|\ \ \ | |/ / |/| |
| * | build - fix disc taskkumavis2017-05-091-1/+1
|/ /
* | Merge pull request #1378 from MetaMask/accounts-when-lockedKevin Serrano2017-05-061-14/+16
|\ \
| * | metamask - publicConfig - fix init statekumavis2017-05-051-1/+1
| * | metamask - selected accounts - dont reveal when lockedkumavis2017-05-051-15/+17
* | | Merge pull request #1376 from MetaMask/1061-Linting-Testskumavis2017-05-0534-484/+428
|\ \ \ | |/ / |/| |
| * | Whoops missed some modulesThomas Huang2017-05-054-8/+0
| * | Remove unused modules and STORAGE_KEYThomas Huang2017-05-056-14/+0
| * | Lint testsThomas Huang2017-05-0532-482/+439
| * | Add Mocha/Chai eslint pluginsThomas Huang2017-05-051-0/+2
| * | Ignore tests bundle, jquery, abd helpersThomas Huang2017-05-051-0/+4
| * | Add mocha and chai plugins eslintThomas Huang2017-05-051-1/+4
| |/
* | Merge pull request #1369 from MetaMask/foxrevertkumavis2017-05-052-7/+7
|\ \ | |/ |/|
| * Minor lintKevin Serrano2017-05-031-1/+1
| * Fox watches over us again.Kevin Serrano2017-05-031-6/+6
|/
* Merge pull request #1360 from MetaMask/flyswatter-patch-1Kevin Serrano2017-05-021-2/+3
|\
| * Merge branch 'master' into flyswatter-patch-1Kevin Serrano2017-05-022-6/+9
| |\ | |/ |/|
* | Merge pull request #1362 from MetaMask/FoxLookAwayKevin Serrano2017-05-022-6/+8
|\ \
| * | Bump changelogDan Finlay2017-05-011-0/+2
| * | Adjust fox look heightDan Finlay2017-05-011-1/+1
| * | Make fox look away while typing passwordDan Finlay2017-05-011-6/+6
|/ /
| * Correct change datesDan Finlay2017-05-011-2/+2
|/
* Merge pull request #1359 from MetaMask/FixBlockPollingv3.6.1Dan Finlay2017-05-014-11/+8
|\
| * Version 3.6.1Dan Finlay2017-05-012-1/+4
| * Use loglevel for more logsDan Finlay2017-05-011-9/+3
| * Bump provider engineDan Finlay2017-05-011-1/+1
|/
* Merge pull request #1358 from MetaMask/kumavis-patch-1Dan Finlay2017-04-292-3/+2
|\
| * Update CHANGELOG.mdkumavis2017-04-291-0/+2
| * notification-manager - remove promise listenerkumavis2017-04-291-3/+0
|/
* Merge pull request #1356 from MetaMask/mascaraTuneUpskumavis2017-04-2915-84/+281
|\
| * clean up codefrankiebee2017-04-293-5/+3
| * General cleanup and window reload if an update is foundfrankiebee2017-04-284-12/+17
| * break out IndexDbController && Run the first time test on mascarafrankiebee2017-04-289-81/+47
| * Setup test enviroment for mascarafrankiebee2017-04-2810-1/+236
| * Update README for mascarafrankiebee2017-04-272-12/+5
| * bump client-sw-ready-eventfrankiebee2017-04-271-1/+1
* | Merge pull request #1343 from MetaMask/Version-3.5.4v3.6.0Version-3.6.0Thomas Huang2017-04-282-2/+7
|\ \
| * | Version 3.6.0Dan Finlay2017-04-282-2/+5
| * | Merge branch 'master' into Version-3.5.4Dan Finlay2017-04-2854-140/+209
| |\ \ | |/ / |/| |
* | | Merge pull request #1352 from MetaMask/rinkebyThomas Huang2017-04-2814-2/+84
|\ \ \
| * \ \ Merge branch 'master' into rinkebyDan Finlay2017-04-2843-137/+124
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1351 from MetaMask/lintDan Finlay2017-04-2841-135/+124
|\ \ \ \
| * | | | Fix linting warningsThomas Huang2017-04-2741-135/+124
| | |_|/ | |/| |
* | | | Merge pull request #1347 from MetaMask/gulp-fail-fixDan Finlay2017-04-281-2/+0
|\ \ \ \
| * | | | build - make gulp return non-zero error code on bundle failkumavis2017-04-261-2/+0
| |/ / /
* | | | Merge pull request #1345 from MetaMask/docker-node7Dan Finlay2017-04-281-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | mascara - docker - bump to node7kumavis2017-04-261-1/+1
| | * | Add to changelog.Kevin Serrano2017-04-261-0/+1
| | * | Add (vague) instructions to adding a new network to the dropdown.Kevin Serrano2017-04-261-0/+25
| | * | Linting.Kevin Serrano2017-04-262-2/+2
| | * | Add missing changes. Create unique style for rinkeby icon.Kevin Serrano2017-04-269-6/+26
| | * | change network name to rinkeby when selectedNickyg2017-04-261-1/+10
| | * | add rinkeby networkNickyg2017-04-266-1/+28
| |/ / |/| |
| | * Version 3.5.4v3.5.4Dan Finlay2017-04-262-1/+3
| |/ |/|
* | Merge pull request #1342 from MetaMask/AllowBigSignatureVkumavis2017-04-262-1/+2
|\ \
| * | Allow signature V values over 1 byteDan Finlay2017-04-262-1/+2
|/ /
* | Merge pull request #1339 from MetaMask/BumpProviderEngineKevin Serrano2017-04-252-1/+4
|\ \
| * | Bump provider-engineDan Finlay2017-04-251-1/+1
| * | Bump provider engineDan Finlay2017-04-252-1/+4
|/ /
* | Merge pull request #1338 from MetaMask/Version-3.5.3kumavis2017-04-252-1/+5
|\ \
| * | Version 3.5.3v3.5.3Dan Finlay2017-04-252-1/+5
|/ /
* | Merge pull request #1336 from MetaMask/buyButtonRedoDan Finlay2017-04-2510-244/+216
|\ \ | |/ |/|
| * fix spellingfrankiebee2017-04-252-4/+4
| * Css fixesfrankiebee2017-04-242-7/+9
| * make buy button greenfrankiebee2017-04-241-1/+1
| * Fix issue where stopPropagation didnt stop submitting the tx when clicking bu...frankiebee2017-04-241-1/+1
| * Merge pull request #1335 from MetaMask/buyButtonRedoCleanUpFrankie2017-04-245-70/+1
| |\
| | * remove updateCoinBaseAmount actionJared Pereira2017-04-243-25/+0
| | * remove updateBuyAddress actionJared Pereira2017-04-244-29/+1
| | * remove case buyFormJared Pereira2017-04-231-3/+0
| | * remove buyButtonDeligator functionJared Pereira2017-04-231-12/+0
| | * remove extra buyAddress in stateJared Pereira2017-04-231-1/+0
| |/
| * Initial redo attempt of the buy view to look like vladt's desighnfrankiebee2017-04-196-195/+173
| * Create a custom radio list componentfrankiebee2017-04-191-0/+61
* | Merge pull request #1331 from MetaMask/i1323-kovanNoticeRemovalDan Finlay2017-04-253-2/+5
|\ \
| * | Add more detailed instructions on generating and deleting notices.Kevin Serrano2017-04-181-0/+4
| * | Remove kovan notice.Kevin Serrano2017-04-182-2/+1
| |/
* | Merge pull request #1333 from MetaMask/firefoxIDBkumavis2017-04-222-57/+40
|\ \ | |/ |/|
| * Clean up codefrankiebee2017-04-221-14/+13
| * Reduce wakeup time for firefoxfrankiebee2017-04-211-1/+1
| * Fix for firefoxfrankiebee2017-04-211-55/+39
|/
* Merge pull request #1313 from MetaMask/wakeUp2kumavis2017-04-073-5/+6
|\
| * fix syntaxfrankiebee2017-04-071-1/+1
| * uncomment intervalDelayfrankiebee2017-04-071-1/+1
| * match intervalsfrankiebee2017-04-071-1/+2
| * Fix wakeUps:frankiebee2017-04-073-6/+6
* | Merge pull request #1312 from MetaMask/WakeUpkumavis2017-04-073-2/+8
|\|
| * Bump sw-client versionfrankiebee2017-04-071-1/+1
generated by cgit (git 2.34.1) at 2024-10-14 20:31:49 +0800