aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
Commit message (Expand)AuthorAgeFilesLines
* 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-1340-376/+550
|\
| * 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-1352-1178/+925
| | |\
| | * \ 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-132-9/+2
| |\ \ \ \
| | * | | | Update gasblocklimit params with every block.Kevin Serrano2017-06-032-9/+2
| * | | | | Use new URL for currency API from cryptonator.Kevin Serrano2017-06-061-1/+1
| |/ / / /
| * | | | Convert gasLimit to not use muln in BNKevin Serrano2017-06-021-2/+8
| * | | | 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
| |/ / / /
| * | | | stop polling when switching networksfrankiebee2017-05-241-0/+1
| * | | | Merge branch 'master' into networkControllerFrankie2017-05-242-9/+72
| |\ \ \ \
| | * | | | 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-239-68/+122
| |\| | | |
| | * | | | 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
| | * | | | | 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
| | |/ / / /
| * / / / / Create a network controller to manage switcing networks an updating the providerfrankiebee2017-05-196-150/+232
| |/ / / /
| * | | | 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
| * | | | Use loglevel for more logsDan Finlay2017-05-011-9/+3
| * | | | notification-manager - remove promise listenerkumavis2017-04-291-3/+0
| * | | | 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
| |/ / / /
* / / / / Add missing tx manager stateDan Finlay2017-04-251-0/+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-035-9/+28
| |\ \ \ \ \
| * | | | | | Clean upfrankiebee2017-03-311-1/+0
| * | | | | | WIP: lost enital call from dapp to getAccountsfrankiebee2017-03-302-0/+2
| * | | | | | Merge branch 'master' into mascarafrankiebee2017-03-297-58/+125
| |\ \ \ \ \ \
| * \ \ \ \ \ \ 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 #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
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #1268 from MetaMask/kovan-faucet-instructionsDan Finlay2017-03-291-0/+4
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into kovan-faucet-instructionsDan Finlay2017-03-294-45/+59
| |\ \ \ \ \ \
| * | | | | | | 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
|/ / / / / /
* / / / / / Allow injection in IFrames + dynamic IFramesStefaan Ponnet2017-03-261-1/+1
|/ / / / /
* | | | | 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
|/
* 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
|/
* Add memstore update after adding new keyringDan Finlay2017-02-161-0/+1
* keyring controller - update memStore after restoreKeyringkumavis2017-02-161-0/+1
* Merge branch 'master' into devDan Finlay2017-02-162-4/+29
|\
| * got hash test passingDan Finlay2017-02-142-2/+5
| * Revert old style message sighingFrankie2017-02-102-2/+24
* | Made migrations non-destructive; fixed currency migration.Kevin Serrano2017-02-1610-22/+49
* | Add migrations for removing terms of use data.Kevin Serrano2017-02-152-0/+31
* | Merge branch 'dev' into disclaimer-notifyKevin Serrano2017-02-102-1/+7
|\ \
| * | Allowed net_version to be called synchronouslyKevin Serrano2017-02-092-1/+7
| |/
* | Delete all code related to disclaimers.Kevin Serrano2017-02-104-73/+0
* | Fix bugs with notice. Add disclaimer notice.Kevin Serrano2017-02-101-3/+3
|/
* Fix typoDan Finlay2017-02-051-1/+1
* Remove shapeshift tx list from idStoreDan Finlay2017-02-051-2/+1
* Stop removing old shapeshift txsDan Finlay2017-02-051-16/+0
* Do not remove completed shapeshift depositsDan Finlay2017-02-041-1/+2
* Fix bug when clearing old shapeshift txsDan Finlay2017-02-041-1/+3
* Automatically remove shapeshift txs over 11 minutes old with no paymentDan Finlay2017-02-041-0/+22
* Add migration to indexDan Finlay2017-02-041-1/+2
* Got ShapeShiftController back to workingDan Finlay2017-02-042-12/+43
* Mostly got shapeshift tx management into its own controllerDan Finlay2017-02-043-37/+112
* eth-store - update store state after manipulatingkumavis2017-02-041-0/+2
* id mgmt - update to latest eth_sign speckumavis2017-02-044-34/+55
* migrations - fix migration #9 and add safety checks to migratorkumavis2017-02-042-3/+14
* eths-store - eagerly set current blockkumavis2017-02-041-0/+2
* metamask - add missing diskState and memState subscriptionskumavis2017-02-031-6/+11
* migration #9 - break out CurrencyController substatekumavis2017-02-036-75/+133
* eth-store - cbs default to noopkumavis2017-02-031-5/+5
* migration #8 - break out NoticeController substatekumavis2017-02-034-28/+63
* eth-store - convert to obs-store subclasskumavis2017-02-032-118/+103
* txManager - depend on preferencesStorekumavis2017-02-032-4/+8
* metamask - introduce networkStorekumavis2017-02-032-35/+50
* migration 7 - break off TransactionManager substatekumavis2017-02-034-25/+89
* messageManager - move view state to obs-storekumavis2017-02-032-38/+28
* keyring - replace getState with memStorekumavis2017-02-032-30/+2
* keyring - manage isUnlocked in memStorekumavis2017-02-031-1/+7
* keyring - rm config depkumavis2017-02-032-5/+2
* Merge branch 'dev' into notice-managementKevin Serrano2017-02-033-1/+2
|\
| * metamask - memState - adopt configManager.isDisclaimerConfirmed from keyring ...kumavis2017-02-022-1/+1
| * emit a update badgeFrankie2017-02-021-1/+1
| * put updateBadge back inFrankie2017-02-021-0/+1
* | Change filepath for new location of notices.Kevin Serrano2017-02-031-1/+1
|/
* swap out set state for updateStateFrankie2017-02-021-4/+1
* Fix messy mergeFrankie2017-02-021-14/+2
* Merge branch 'dev' into messageManagerCleanUpFrankie2017-02-022-50/+69
|\
| * metamask - adopt isInitialized from keyring controllerkumavis2017-02-012-4/+8
| * keyring - move identities into memStorekumavis2017-02-011-7/+15
| * keyring - add keyringtypes to memStorekumavis2017-02-011-3/+3
| * metamask - inherit some configManager state from keyring controllerkumavis2017-02-012-10/+13
| * keyring - synchronous getStatekumavis2017-02-012-46/+47
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-02-028-47/+110
|\|
| * migration #6 - fix selectedAddress data sourcekumavis2017-01-311-2/+2
| * inpage - set web3.eth.defaultAccount correctlykumavis2017-01-312-2/+2
| * continue rename selectedAccount to selectedAddresskumavis2017-01-314-13/+13
| * rename selectedAccount to selectedAddresskumavis2017-01-314-10/+13
| * metamask - rename getSelectedAccount to getSelectedAddresskumavis2017-01-312-5/+5
| * migration #6 - move selectedAccount from keyringController to preferencesCont...kumavis2017-01-312-0/+42
| * metamask - move selectedAccount set/get to preferencesControllerkumavis2017-01-312-33/+12
| * preferences - introduce preferences controllerkumavis2017-01-312-0/+39
* | code clan up and testsFrankie2017-02-023-41/+39
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-302-4/+13
|\|
| * metamask - lookup selectedAccount via keyringControllerkumavis2017-01-302-3/+12
| * public config - get selectedAccount from keyring controller substatekumavis2017-01-301-1/+1
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-295-174/+236
|\|
| * metamask - subscribe metamask store to keyringController substatekumavis2017-01-291-0/+3
| * migration 5 - move keyring controller state to substatekumavis2017-01-293-67/+95
| * keyring - add and initialize obs-storekumavis2017-01-292-6/+36
| * metamask - adopt shapeshift txs from keyringControllerkumavis2017-01-282-2/+3
| * tests - remove persistence and start with initial statekumavis2017-01-281-9/+1
| * metamask - organize methodskumavis2017-01-281-120/+126
* | Clean up message manger includes:Frankie2017-01-295-126/+129
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-284-194/+205
|\|
| * metamask - fix setupProviderConnectionkumavis2017-01-271-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 21:38:59 +0800