aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into kovan-faucet-instructionsKevin Serrano2017-03-281-1/+1
|\
| * Version 3.5.1v3.5.1Dan Finlay2017-03-281-1/+1
* | Add link to kovan faucet instructions.Kevin Serrano2017-03-281-0/+4
|/
* Version 3.5.0v3.5.0Dan Finlay2017-03-281-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
|/
* 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
* keyring controller - update memStore after restoreKeyringkumavis2017-02-161-0/+1
* Merge branch 'master' into devDan Finlay2017-02-163-5/+30
|\
| * got hash test passingDan Finlay2017-02-142-2/+5
| * Version 3.2.2v3.2.2Dan Finlay2017-02-101-1/+1
| * 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
|\ \
| * | Merge branch 'dev' into i1085-synchronousnetkumavis2017-02-101-1/+1
| |\|
| * | 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
| |/ |/|
* | Version 3.2.1v3.2.1Dan Finlay2017-02-091-1/+1
|/
* Version 3.2.0v3.2.0Dan Finlay2017-02-081-1/+1
* 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
| * keymanager - small cleankumavis2017-01-271-2/+2
| * metamask controller - cleanup remote apikumavis2017-01-271-77/+100
| * metamask - organize into sectionskumavis2017-01-271-49/+61
| * metamask - use web3-stream-provider/handler instead of manual wiringkumavis2017-01-271-23/+8
| * metamask controller - adopt setup*Communication from backgroundkumavis2017-01-272-44/+41
| * background - stream disconnection fixkumavis2017-01-272-8/+8
| * metamask controller - adopt clearSeedWords from keyring controllerkumavis2017-01-272-15/+9
* | Rewrite message controller to fit controller patternFrankie2017-01-281-48/+45
|/
* background - graceful publicConfigStore connection teardownkumavis2017-01-271-1/+3
* background - organize metamask instantiationkumavis2017-01-273-47/+37
* obs-store - use published modulekumavis2017-01-2510-295/+85
* migrations - rename 005 to stubbed _multi-keyringkumavis2017-01-251-0/+7
* Merge branch 'dev' of github.com:MetaMask/metamask-plugin into obs-store2kumavis2017-01-253-32/+34
|\
| * Merge branch 'dev' into i#1048kumavis2017-01-252-0/+56
| |\
| | * Merge pull request #1051 from MetaMask/hotfix1048Frankie2017-01-251-3/+5
| | |\
| * | | background controller - extract KeyringC.placeSeedWords to MetamaskCkumavis2017-01-252-22/+16
| * | | merge master hotfix into devkumavis2017-01-251-1/+1
| |\ \ \
| | * | | 3.1.2kumavis2017-01-251-1/+1
| | | |/ | | |/|
| | * | hotfix - dont assume hd keyring positionkumavis2017-01-251-3/+5
| * | | keyring-controller - cleanupkumavis2017-01-251-2/+3
| * | | keyring-controller - cleanupkumavis2017-01-251-5/+3
| * | | Move the assumption of their only being one hd keyring when requesting seed w...Frankie2017-01-252-7/+8
| * | | Fix issue where generating a new account would put it in loose keysFrankie2017-01-252-4/+12
| |/ /
* | | Merge branch 'dev' into obs-store2kumavis2017-01-2211-136/+329
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into upToDateFrankie2017-01-211-1/+1
| |\|
| | * 3.1.1kumavis2017-01-211-1/+1
| * | Merge branch 'master' into upToDateFrankie2017-01-211-1/+3
| |\|
| | * keyring controller - placeSeedWords should use first hdKeyringkumavis2017-01-211-1/+3
| * | Merge branch 'dev' into i715-AddJsonImportDan Finlay2017-01-192-2/+2
| |\|
| | * Merge branch 'master' into Version-3.1.0Dan Finlay2017-01-191-1/+1
| | |\
| | | * Merge branch 'master' into fixSignedVsSubmittedFrankie2017-01-192-4/+7
| | | |\
| | | * | Fix the dissplay for submitted transactions and the listner wating to hear wh...Frankie2017-01-191-1/+1
| | * | | Version 3.1.0Dan Finlay2017-01-191-1/+1
| * | | | Add ability to import v3 JSON walletsDan Finlay2017-01-191-5/+13
| * | | | Added new modular private key import systemDan Finlay2017-01-192-0/+48
| |/ / /
| * | | Merge branch 'dev' into i715-AddImportMenukumavis2017-01-191-6/+5
| |\ \ \
| | * | | tx-manager - use rpc-specified txHashkumavis2017-01-191-6/+5
| * | | | Allow importing of private key stringsDan Finlay2017-01-183-8/+22
| |/ / /
| * | | Merge branch 'dev' into conversion-api-errDan Finlay2017-01-1810-131/+250
| |\ \ \
| | * | | Version 3.0.1Dan Finlay2017-01-171-1/+1
| | * | | Fix bug where signed messages were not dismissedDan Finlay2017-01-171-0/+1
| | * | | Fix removeHexPrefix to stripHexPrefixDan Finlay2017-01-171-1/+1
| | * | | Wrote fix for eth.signDan Finlay2017-01-171-2/+1
| | | |/ | | |/|
| | * | Fix manifest versionDan Finlay2017-01-171-1/+1
| | * | Version 3.0.0Dan Finlay2017-01-171-1/+1
| | * | keyring - simple - throw error if wallet not found for addresskumavis2017-01-171-1/+4
| | * | keyring - simple - fix address generationkumavis2017-01-171-3/+3
| | |/
| | * eth-store - emit update on new account addkumavis2017-01-151-1/+3
| | * background - txManager - filter txs by networkkumavis2017-01-152-4/+6
| | * background - return txHash to provider-engine on donekumavis2017-01-152-14/+13
| | * Fix the inclusion of the txFee in the meta tx objectFrankie2017-01-151-3/+5
| | * fix for lintingFrankie2017-01-141-0/+1
| | * Satisfy review needs:Frankie2017-01-142-21/+23
| | * fix the maxcost not being included in txMetaFrankie2017-01-141-3/+7
| | * Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into bug-s...kumavis2017-01-144-13/+38
| | |\
| | | * Merge branch 'dev' into bug-submitTxkumavis2017-01-144-13/+38
| | | |\
| | | | * Merge branch 'dev' into integrateTxManagerUIFrankie2017-01-141-2/+2
| | | | |\
| | | | * | Clean up codeFrankie2017-01-141-1/+2
| | | | * | Merge branch 'dev' into integrateTxManagerUIFrankie2017-01-121-1/+1
| | | | |\ \
| | | | * | | Fix wording and icon of failed txsFrankie2017-01-122-15/+16
| | | | * | | Add to CHANGELOGFrankie2017-01-121-2/+8
| | | | * | | Merge branch 'dev' into integrateTxManagerUIFrankie2017-01-123-36/+11
| | | | |\ \ \
| | | | * | | | Take some of the tx Logic out of the UI and create a visble state for pending...Frankie2017-01-124-9/+28
| | * | | | | | background - metamask controller - fix 'this' refkumavis2017-01-141-7/+8
| | |/ / / / /
| | * | | | / background - handle tx finalization in controllers instead of provider-enginekumavis2017-01-134-108/+186
| | | |_|_|/ | | |/| | |
| * | | | | currency conversion - less noisy errorkumavis2017-01-121-1/+1
| | |_|/ / | |/| | |
* | | | | background - fix metamaskController store -> diskStore persistencekumavis2017-01-131-1/+6
* | | | | migrations - wip - 005 multivault migrationkumavis2017-01-127-31/+82
* | | | | migrations - introduce promise-based migratorkumavis2017-01-125-112/+179
* | | | | background - move pojo migrator to outside of metamask controllerkumavis2017-01-1211-104/+159
* | | | | background - introduce ObservableStorekumavis2017-01-129-166/+204
| |/ / / |/| | |
* | | | bugfix - portstream - dont wrap cb in try catchkumavis2017-01-121-2/+2
| |_|/ |/| |
* | | Send update to UI when changing selected accountDan Finlay2017-01-121-1/+1
|/ /
* | rpc - fix sync account cache settingkumavis2017-01-111-17/+1
* | web3 provider - override eth_syncing and web3_clientVersionkumavis2017-01-111-0/+5
* | Remove erroneous OOG estimation logic.Dan Finlay2017-01-111-15/+2
* | deps - replace promise-request with fetchkumavis2017-01-111-4/+3
|/
* Merge branch 'dev' into TearDownOnDisconnectkumavis2017-01-063-31/+33
|\
| * Merge branch 'dev' into fixTxManagerDan Finlay2017-01-062-1/+145
| |\
| * | Combine two identical then blocksDan Finlay2017-01-061-4/+2
| * | remove unnecessary try statmentsFrankie2017-01-053-37/+24
| * | clean upFrankie2017-01-051-1/+1
| * | Merge branch 'dev' into fixtTxManagerFrankie2017-01-054-37/+68
| |\ \
| * | | Fix signing of transactionsFrankie2017-01-053-46/+62
* | | | Merge branch 'dev' into TearDownOnDisconnectkumavis2017-01-062-1/+145
|\ \ \ \ | | |_|/ | |/| |
| * | | Fixed bugs with sanity-checkingDan Finlay2017-01-051-12/+10
| * | | Fix dependency referenceDan Finlay2017-01-051-1/+1
| * | | Caught typoDan Finlay2017-01-051-2/+3
| * | | Add descriptive commentDan Finlay2017-01-051-0/+9
| * | | LintedDan Finlay2017-01-051-22/+17
| * | | Removed reliance on eth-store internal custom eth-queryDan Finlay2017-01-051-6/+15
| * | | Move eth-store@1.1.0 into local repo.Dan Finlay2017-01-051-0/+132
| | |/ | |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 10:27:53 +0800