aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Version 3.8.0v3.8.0Dan Finlay2017-06-291-1/+1
* Merge pull request #1620 from MetaMask/i1616-AddTokenAddingThomas Huang2017-06-292-4/+26
|\
| * Merge branch 'master' into i1616-AddTokenAddingDan Finlay2017-06-231-1/+3
| |\
| * \ Merge branch 'AddTokenList' into i1616-AddTokenAddingDan Finlay2017-06-202-36/+74
| |\ \
| * | | Add ability to add tokens to token listDan Finlay2017-06-162-4/+26
* | | | Merge pull request #1509 from MetaMask/i1473-dappDefaultGasPriceDan Finlay2017-06-281-7/+9
|\ \ \ \
| * \ \ \ Merge branch 'master' into i1473-dappDefaultGasPriceThomas Huang2017-06-286-4/+70
| |\ \ \ \
| * | | | | Keeps dapp gas price if setThomas Huang2017-06-201-7/+9
* | | | | | Merge pull request #1685 from MetaMask/setFailedDan Finlay2017-06-282-0/+39
|\ \ \ \ \ \
| * | | | | | Create a migration for setting tx's with the message 'Gave up submitting tx.'...frankiebee2017-06-282-0/+39
| | |/ / / / | |/| | | |
* / | | | | dont stop retrying brodcasting txsfrankiebee2017-06-281-4/+0
|/ / / / /
* | | | | Fix error message for invalid seed words.Kevin Serrano2017-06-271-1/+1
* | | | | Merge pull request #1663 from MetaMask/infura-statusThomas Huang2017-06-272-1/+56
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add infura network status to our UI state.Kevin Serrano2017-06-231-1/+1
| * | | | Add infura network status to our UI state.Kevin Serrano2017-06-232-1/+56
* | | | | Merge pull request #1603 from MetaMask/AddTokenListKevin Serrano2017-06-233-1/+10
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTo...Kevin Serrano2017-06-203-1/+10
| |\ \ \ | | |/ / | |/| / | | |/
| | * Merge remote-tracking branch 'origin/master' into AddTokenListDan Finlay2017-06-161-10/+5
| | |\
| | * | Refresh token balance on network changeDan Finlay2017-06-151-1/+0
| | * | Persist selected account tabDan Finlay2017-06-152-0/+9
| | * | Merge branch 'master' into AddTokenListDan Finlay2017-06-1342-379/+552
| | |\ \
| | * | | Add missing tx manager stateDan Finlay2017-04-251-0/+1
* | | | | Fix badge number to include personal_signKevin Serrano2017-06-211-1/+3
|/ / / /
* | | | Merge branch 'master' into i1567-FixInaccurateErrorFrankie2017-06-171-3/+2
|\ \ \ \
| * \ \ \ Merge pull request #1623 from MetaMask/checkTxsFrankie2017-06-171-3/+2
| |\ \ \ \
| | * | | | put the block listeners back on the providerfrankiebee2017-06-171-3/+2
* | | | | | put event back on the "blockTracker:/provider"frankiebee2017-06-171-1/+1
* | | | | | Merge branch 'master' into i1567-FixInaccurateErrorfrankiebee2017-06-171-1/+5
|\| | | | |
| * | | | | Debounce background updatesDan Finlay2017-06-161-1/+5
| |/ / / /
* | | | | Merge branch 'master' into i1567-FixInaccurateErrorfrankiebee2017-06-161-16/+52
|\| | | |
| * | | | Merge pull request #1611 from MetaMask/checkTxsOnSynckumavis2017-06-161-0/+46
| |\ \ \ \
| | * | | | transactions controller - add commentskumavis2017-06-161-0/+5
| | * | | | add a check for weather a tx is included in a block when jumping blocksfrankiebee2017-06-151-0/+41
| | | |_|/ | | |/| |
| * / | | check for the tx in the block that provider engine gives usfrankiebee2017-06-151-15/+5
| |/ / /
* | | | check nonce and balance when resubmiting txfrankiebee2017-06-162-11/+17
* | | | remove unnecessary logfrankiebee2017-06-151-4/+1
* | | | Do not mark slowly mined txs as failed.Dan Finlay2017-06-151-8/+4
|/ / /
* | | Merge pull request #1598 from MetaMask/txRetryDan Finlay2017-06-141-9/+4
|\ \ \
| * | | rename continuallyResubmitPendingTxs to resubmitPendingTxsfrankiebee2017-06-141-2/+2
| * | | put tx resubmission on the block eventfrankiebee2017-06-131-8/+3
* | | | Fix networkState in chain idThomas Huang2017-06-131-1/+1
| |_|/ |/| |
* | | Version 3.7.8v3.7.8Dan Finlay2017-06-131-1/+1
|/ /
* | Merge pull request #1208 from MetaMask/i#1203MainNetSwitchkumavis2017-06-131-2/+5
|\ \
| * | default testnet - fix typokumavis2017-06-131-1/+0
| * | Merge branch 'master' into i#1203MainNetSwitchkumavis2017-06-1354-1182/+929
| |\ \
| * \ \ Merge branch 'master' into i#1203MainNetSwitchFrankie2017-03-173-1/+97
| |\ \ \
| * \ \ \ Merge branch 'master' into i#1203MainNetSwitchkumavis2017-03-153-3/+3
| |\ \ \ \
| * | | | | Swithch the default network to mainnetfrankiebee2017-03-141-3/+6
* | | | | | LintingThomas Huang2017-06-132-3/+3
| |_|_|/ / |/| | | |
* | | | | Merge branch 'master' into currency-fixDan Finlay2017-06-133-10/+3
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into gasupdaterDan Finlay2017-06-131-1/+1
| |\ \ \ \ \
| | * | | | | 3.7.7kumavis2017-06-091-1/+1
| * | | | | | Update gasblocklimit params with every block.Kevin Serrano2017-06-032-9/+2
* | | | | | | Merge branch 'master' into currency-fixKevin Serrano2017-06-061-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Version 3.7.6v3.7.6Dan Finlay2017-06-061-1/+1
| * | | | | | Version 3.7.5Dan Finlay2017-06-061-1/+1
| |/ / / / /
* / / / / / Use new URL for currency API from cryptonator.Kevin Serrano2017-06-062-2/+2
|/ / / / /
* | | | | Version 3.7.4v3.7.4Dan Finlay2017-06-031-1/+1
* | | | | Merge pull request #1533 from MetaMask/i1528-gasLimitLowkumavis2017-06-031-2/+8
|\ \ \ \ \
| * | | | | Convert gasLimit to not use muln in BNKevin Serrano2017-06-021-2/+8
* | | | | | Version 3.7.3v3.7.3Dan Finlay2017-06-021-1/+1
|/ / / / /
* | | | | Version 3.7.2v3.7.2Dan Finlay2017-06-011-1/+1
* | | | | Merge pull request #1500 from MetaMask/RemoveStreamingSubproviderThomas Huang2017-05-261-17/+5
|\ \ \ \ \
| * | | | | Remove stream subproviderDan Finlay2017-05-261-17/+5
* | | | | | fix spellingfrankiebee2017-05-251-2/+2
* | | | | | Merge branch 'master' into reloadDappfrankiebee2017-05-252-2/+14
|\| | | | |
| * | | | | Merge pull request #1494 from MetaMask/1472-gasceilingDan Finlay2017-05-251-1/+12
| |\ \ \ \ \
| | * | | | | Add new blockGasLimit property to txMeta object.Kevin Serrano2017-05-251-1/+12
| * | | | | | inpage-provider - disable polling after first blockkumavis2017-05-251-1/+2
| |/ / / / /
* / / / / / Reload the page when switching networks for sites that use web3frankiebee2017-05-253-41/+28
|/ / / / /
* | | | | Merge pull request #1487 from MetaMask/stopPollingkumavis2017-05-251-0/+1
|\ \ \ \ \
| * | | | | stop polling when switching networksfrankiebee2017-05-241-0/+1
* | | | | | Merge branch 'master' into Version-3.7.1kumavis2017-05-249-125/+297
|\| | | | |
| * | | | | Merge branch 'master' into networkControllerFrankie2017-05-243-10/+73
| |\ \ \ \ \
| | * | | | | Version 3.7.0v3.7.0Dan Finlay2017-05-241-1/+1
| | * | | | | CleanupDan Finlay2017-05-241-2/+3
| | * | | | | Continually resubmit pending txsDan Finlay2017-05-241-2/+52
| | * | | | | clean - remove console logskumavis2017-05-231-2/+0
| | * | | | | deps - use stream-subprovider from provider-enginekumavis2017-05-232-3/+3
| | * | | | | Rename stream to streamSubproviderDan Finlay2017-05-231-4/+4
| | * | | | | Use filter subprovider in-page to avoid filter leaksDan Finlay2017-05-231-2/+6
| | * | | | | Use stream-provider v3 apiDan Finlay2017-05-231-2/+2
| | * | | | | Add new streaming subprovider but getting a loopDan Finlay2017-05-211-5/+15
| * | | | | | include ethQuery in txControllerfrankiebee2017-05-241-0/+1
| * | | | | | Fix for testsfrankiebee2017-05-245-55/+68
| * | | | | | 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-2311-70/+123
| |\| | | | |
| * | | | | | 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
| |/ / / / / |/| | | | |
* | | | | | Version 3.6.5v3.6.5Dan Finlay2017-05-181-1/+1
* | | | | | Fix path referencesDan Finlay2017-05-171-2/+2
* | | | | | Rename tx manager to tx controllerDan Finlay2017-05-173-18/+18
* | | | | | migration 13 - change provider from testnet to ropstenkumavis2017-05-162-0/+35
* | | | | | Remove all traces of testnetThomas Huang2017-05-163-18/+10
* | | | | | Merge branch 'master' into i1419-rinkebydefaultnetworkThomas Huang2017-05-161-22/+16
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #1422 from MetaMask/drop-asyncqDan Finlay2017-05-161-22/+16
| |\ \ \ \ \ \
| | * | | | | | background - drop async-q in favor of async/awaitkumavis2017-05-131-22/+16
* | | | | | | | Change default network to rinkebyThomas Huang2017-05-162-8/+8
|/ / / / / / /
* | | | | | | migrator - fix typokumavis2017-05-131-1/+1
* | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into fixMigrator2kumavis2017-05-132-2/+1
|\| | | | | |
| * | | | | | Trim currency list.Kevin Serrano2017-05-121-1/+0
| * | | | | | Version 3.6.4v3.6.4Dan Finlay2017-05-101-1/+1
| |/ / / / /
* | | | | | migrator - cleaner migration runner with es7kumavis2017-05-121-25/+13
* | | | | | use asyncQ.waterfall instead of asyncQ.eachSeriesfrankiebee2017-05-121-4/+10
* | | | | | fix migratorfrankiebee2017-05-111-9/+8
|/ / / / /
* | | | | Version 3.6.3v3.6.3Dan Finlay2017-05-091-1/+1
* | | | | Version 3.6.2v3.6.2Dan Finlay2017-05-091-1/+1
* | | | | ui - remove web3, use eth-querykumavis2017-05-091-2/+3
* | | | | metamask - publicConfig - fix init statekumavis2017-05-051-1/+1
* | | | | metamask - selected accounts - dont reveal when lockedkumavis2017-05-051-15/+17
* | | | | Minor lintKevin Serrano2017-05-031-1/+1
* | | | | Version 3.6.1Dan Finlay2017-05-011-1/+1
* | | | | Use loglevel for more logsDan Finlay2017-05-011-9/+3
* | | | | notification-manager - remove promise listenerkumavis2017-04-291-3/+0
* | | | | Version 3.6.0Dan Finlay2017-04-281-1/+1
* | | | | Merge branch 'master' into Version-3.5.4Dan Finlay2017-04-2834-119/+123
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into rinkebyDan Finlay2017-04-2832-118/+111
| |\ \ \ \ \
| | * | | | | Fix linting warningsThomas Huang2017-04-2732-119/+112
| * | | | | | Add missing changes. Create unique style for rinkeby icon.Kevin Serrano2017-04-262-2/+6
| * | | | | | add rinkeby networkNickyg2017-04-262-0/+7
| |/ / / / /
* / / / / / Version 3.5.4v3.5.4Dan Finlay2017-04-261-1/+1
|/ / / / /
* | | | / Version 3.5.3v3.5.3Dan Finlay2017-04-251-1/+1
| |_|_|/ |/| | |
* | | | auto-faucet - only skip faucet on explicit test environmentkumavis2017-04-051-1/+1
* | | | add platforms to mascara + move buyEther window open to uikumavis2017-04-055-20/+72
* | | | Merge pull request #1307 from MetaMask/mascarakumavis2017-04-051-1/+0
|\ \ \ \
| * | | | clean - metamask controller - remove logkumavis2017-04-051-1/+0
| * | | | Merge branch 'master' into mascarafrankiebee2017-04-0310-193/+160
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into mascarafrankiebee2017-04-036-10/+30
| |\ \ \ \ \
| * | | | | | Clean upfrankiebee2017-03-311-1/+0
| * | | | | | WIP: lost enital call from dapp to getAccountsfrankiebee2017-03-302-0/+2
| * | | | | | Merge branch 'master' into mascarafrankiebee2017-03-298-60/+127
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into mascarafrankiebee2017-03-2413-569/+127
| |\ \ \ \ \ \ \
| * | | | | | | | WIP: indexdb is at an err state "provider is undefined"frankiebee2017-03-241-1/+0
| * | | | | | | | WIP: streams->indexdbfrankiebee2017-03-242-1/+1
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #1308 from MetaMask/FixFaucetKevin Serrano2017-04-052-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix faucet to only autoFaucet first accountfrankiebee2017-04-052-0/+3
| | |_|_|_|/ / / | |/| | | | | |
* / | | | | | | Switch auto-faucet from XMLHttpRequest to fetchfrankiebee2017-04-041-5/+11
|/ / / / / / /
* | | | | | | notification-manager - rename show -> showPoup + make getPopup privatekumavis2017-04-012-11/+11
* | | | | | | ui - use global.platform for extension interactionkumavis2017-04-012-0/+8
* | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into platformkumavis2017-04-011-4/+16
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | tx-manager - add eip155 supportkumavis2017-03-311-4/+16
* | | | | | | ui - move popup auto-close after tx conf to ui entrypointkumavis2017-04-011-1/+5
* | | | | | | ui - startPopup returns store after bootkumavis2017-04-012-29/+32
* | | | | | | extension - remove local extension files, we use extensionizerkumavis2017-03-312-85/+0
* | | | | | | introduce platform api and rename notifications to notification-managerkumavis2017-03-316-79/+116
* | | | | | | extension - prefer extensionizer modulekumavis2017-03-311-1/+1
|/ / / / / /
* | | | | | Merge pull request #1288 from MetaMask/i1285-FixFirefoxCurrencyChecksKevin Serrano2017-03-301-1/+2
|\ \ \ \ \ \
| * | | | | | Fix currency checking for firefoxDan Finlay2017-03-301-1/+2
* | | | | | | Merge pull request #1293 from MetaMask/ImproveGasEstimatesKevin Serrano2017-03-301-3/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | tx-utils - gas buffer ceiling at 90% of block gas limitkumavis2017-03-301-3/+4
* | | | | | | LintedDan Finlay2017-03-301-1/+1
* | | | | | | Fix popup behavior for FirefoxDan Finlay2017-03-302-2/+7
* | | | | | | Add missing migration.Kevin Serrano2017-03-291-0/+1
| |_|_|/ / / |/| | | | |
* | | | | | Version 2.5.2v3.5.2v2.5.2Dan Finlay2017-03-291-1/+1
* | | | | | Merge pull request #1268 from MetaMask/kovan-faucet-instructionsDan Finlay2017-03-291-0/+4
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into kovan-faucet-instructionsDan Finlay2017-03-295-46/+60
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into kovan-faucet-instructionsKevin Serrano2017-03-281-1/+1
| |\ \ \ \ \ \ \
| * | | | | | | | Add link to kovan faucet instructions.Kevin Serrano2017-03-281-0/+4
* | | | | | | | | Merge pull request #1273 from MetaMask/i1267-seedfixDan Finlay2017-03-291-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Assure that seed words are placed into state tree upon request.Kevin Serrano2017-03-281-1/+1
* | | | | | | | | Merge pull request #1276 from MetaMask/ImproveGasEstimateskumavis2017-03-293-43/+44
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | tx manager - emit update on new unapproved txkumavis2017-03-291-1/+2
| * | | | | | | | tx manager - add eth-querykumavis2017-03-291-1/+3
| * | | | | | | | tx manager - adjust new tx flow and txMeta decorationskumavis2017-03-292-41/+32
| * | | | | | | | Improve UI gas calculation logicDan Finlay2017-03-291-0/+7
| |/ / / / / / /
* / / / / / / / Fix injection logic.Kevin Serrano2017-03-291-3/+16
|/ / / / / / /
* | | | | | | Merge branch 'master' into masterDan Finlay2017-03-281-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Version 3.5.1v3.5.1Dan Finlay2017-03-281-1/+1
| |/ / / / /
| * | | | | Version 3.5.0v3.5.0Dan Finlay2017-03-281-1/+1
* | | | | | Allow injection in IFrames + dynamic IFramesStefaan Ponnet2017-03-262-2/+2
|/ / / / /
* | | | | Merge branch 'master' into i1210-txdisappearanceKevin Serrano2017-03-253-3/+40
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into notice-modificationDan Finlay2017-03-251-3/+3
| |\ \ \ \ \
| | * | | | | Remove gas limit paramDan Finlay2017-03-241-3/+3
| | | |/ / / | | |/| | |
| * | | | | Create migration to erase body in read notices.Kevin Serrano2017-03-231-0/+36
| * | | | | Remove notice body after reading.Kevin Serrano2017-03-231-0/+1
| |/ / / /
* / / / / Fix persistence of transactions between networks.Kevin Serrano2017-03-231-10/+22
|/ / / /
* | | | Merge branch 'master' into i238-kovanDan Finlay2017-03-231-9/+5
|\ \ \ \
| * \ \ \ Merge branch 'master' into i1237-xmlfix2Kevin Serrano2017-03-231-1/+5
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into i1237-xmlfix2Kevin Serrano2017-03-231-5/+10
| |\ \ \ \ \
| * | | | | | Modify logic for injection conditions.Kevin Serrano2017-03-231-9/+5
* | | | | | | Merge branch 'master' into i238-kovanKevin Serrano2017-03-231-1/+5
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Add current block number and hash to the state.Kevin Serrano2017-03-231-1/+5
| | |/ / / / | |/| | | |
* | | | | | Add kovan config settings to config manager.Kevin Serrano2017-03-231-0/+4
* | | | | | Add kovan to config file.Kevin Serrano2017-03-231-0/+2
|/ / / / /
* / / / / Have better error messagesfrankiebee2017-03-231-5/+10
|/ / / /
* | | / Remove eth-lightwalletDan Finlay2017-03-174-550/+1
| |_|/ |/| |
* | | Merge branch 'master' into i1165-predictiveKevin Serrano2017-03-153-3/+3
|\ \ \ | | |/ | |/|
| * | Rename variables to proper currency state variables.Kevin Serrano2017-03-151-1/+1
| * | Fix description of some migrations.Kevin Serrano2017-03-152-2/+2
| |/
* | Limit the number of addresses stored in our book.Kevin Serrano2017-03-141-0/+4
* | Connect keyring controller to address book to prevent additional duplicates.Kevin Serrano2017-03-112-9/+23
* | Improve duplicate checking in address book.Kevin Serrano2017-03-111-2/+2
* | Add comments.Kevin Serrano2017-03-111-4/+19
* | Allow for adding recently used addresses to address book.Kevin Serrano2017-03-101-0/+4
* | Rename functions for consistency.Kevin Serrano2017-03-101-6/+6
* | Create persistence address book.Kevin Serrano2017-03-102-0/+57
* | Create distinct labels and names for addresses.Kevin Serrano2017-03-101-1/+3
|/
* Version 3.4.0v3.4.0Dan Finlay2017-03-091-1/+1
* Modify message.Kevin Serrano2017-03-091-1/+1
* Add more informative messageKevin Serrano2017-03-091-1/+3
* Merge branch 'master' into i1065-removealertKevin Serrano2017-03-091-20/+22
|\
| * Merge branch 'master' into kumavis-patch-1Dan Finlay2017-03-095-39/+81
| |\
| * | tx-utils - add encoding utilskumavis2017-03-081-1/+1
| * | tx-utils - stricter naming type-based conventionkumavis2017-03-081-9/+15
| * | tx-utils - clean and commentkumavis2017-03-081-15/+11
* | | Convert alert to a log.errorKevin Serrano2017-03-091-1/+1
| |/ |/|
* | Merge branch 'master' into i1144-moarrpcKevin Serrano2017-03-092-6/+30
|\|
| * Merge branch 'master' into i1118-IncreaseGasBufferDan Finlay2017-03-081-1/+1
| |\
| | * Fix grammar in erro messagefrankiebee2017-03-081-1/+1
| * | Merge branch 'master' into i1118-IncreaseGasBufferjaredpereira2017-03-081-1/+22
| |\|
| | * Merge branch 'master' into i#1032frankiebee2017-03-083-13/+19
| | |\
| | * | fix issue where account import allows for duplicatesfrankiebee2017-03-081-1/+22
| * | | change BN.mul to BN.mulnJared Pereira2017-03-081-1/+1
| * | | remove constant buffer and add multiplierJared Pereira2017-03-081-5/+8
| | |/ | |/|
* | | Nodeify and promisify calls to background.Kevin Serrano2017-03-091-2/+4
* | | Refactor of code into separate reducers and actions.Kevin Serrano2017-03-082-5/+14
* | | Merge branch 'master' into i1144-moarrpcKevin Serrano2017-03-083-13/+19
|\| |
| * | Merge branch 'master' into i1173-ShowPersonalMessageDan Finlay2017-03-072-5/+5
| |\ \
| | * | Fix issue where old txMeta object was being used to pass the txHash to the cbFrankie2017-03-072-5/+5
| | |/
| * | Fix normalizeMsgData function to always return hex prefixedDan Finlay2017-03-071-1/+1
| * | Render personal_sign messages as utf-8 textDan Finlay2017-03-071-8/+14
| |/
* | More conflict resolution.Kevin Serrano2017-03-024-4/+4
|\ \
| * | add controllers to root scripts folderDan Finlay2017-02-284-3/+3
| * | Merge branch 'master' into i1144-moarrpcDan Finlay2017-02-2812-281/+252
| |\ \
* | \ \ Fix merge conflicts.Kevin Serrano2017-03-0214-327/+267
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Add a couple more debug logsDan Finlay2017-03-011-0/+1
| * | Use correct action to update and submit txDan Finlay2017-03-011-0/+1
| * | LintedDan Finlay2017-03-011-1/+0
| * | Remove gasMultiplier txMeta paramDan Finlay2017-03-016-44/+4
| * | Fixed bug that made send screen sometimes transition to account detailDan Finlay2017-03-011-0/+1
| * | Add background method for updating and approving a tx in one callDan Finlay2017-02-281-2/+9
| * | Merge branch 'master' into i765-gaslimitsDan Finlay2017-02-2812-281/+251
| |\|
| | * Removed redundant personal_recover logicDan Finlay2017-02-252-18/+0
| | * Mostly fix personal_recoverDan Finlay2017-02-252-6/+6
| | * Fix cancel msg signing behavior.Dan Finlay2017-02-241-6/+25
| | * Got personal_sign workingDan Finlay2017-02-243-21/+42
| | * Add alternate UI for pending personal_sign messagesDan Finlay2017-02-242-1/+3
| | * Add personal sign actions and templateDan Finlay2017-02-231-0/+5
| | * Allow provider to init before keyringControllerDan Finlay2017-02-221-2/+6
| | * Fix referenceDan Finlay2017-02-221-1/+1
| | * Point metamask-controller personalSignRecover method to keyring-controllerDan Finlay2017-02-221-9/+5
| | * Move sigUtil and keyrings to external modulesDan Finlay2017-02-2210-261/+202
| * | Make gasPrice accessible to the UI.Kevin Serrano2017-02-251-0/+1
| |/
* | Tested against code to play nice with unit tests.Kevin Serrano2017-02-242-3/+12
* | Implemented functionality for displaying recent custom RPCsKevin Serrano2017-02-231-14/+15
* | Fix namingKevin Serrano2017-02-222-3/+3
* | Basic infrasture for RPC list added.Kevin Serrano2017-02-222-3/+24
|/
* Version 3.3.0v3.3.0Dan Finlay2017-02-211-1/+1
* Add memstore update after adding new keyringDan Finlay2017-02-161-0/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 09:35:58 +0800