aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1057 from MetaMask/kumavis-refactor1kumavis2017-01-274-62/+44
|\
| * background - graceful publicConfigStore connection teardownkumavis2017-01-271-1/+3
| * config-manager - default to USD for currentFiatkumavis2017-01-271-14/+4
| * background - organize metamask instantiationkumavis2017-01-273-47/+37
|/
* Merge pull request #999 from MetaMask/obs-store2kumavis2017-01-2521-562/+508
|\
| * mock-dev - cleanup missing polyfillkumavis2017-01-251-3/+0
| * obs-store - use published modulekumavis2017-01-2516-327/+113
| * migrations - rename 005 to stubbed _multi-keyringkumavis2017-01-251-0/+7
| * Merge branch 'dev' of github.com:MetaMask/metamask-plugin into obs-store2kumavis2017-01-258-36/+62
| |\ | |/ |/|
* | Merge pull request #1054 from MetaMask/i#1048Frankie2017-01-257-35/+58
|\ \
| * \ Merge branch 'dev' into i#1048kumavis2017-01-2512-12/+166
| |\ \ | |/ / |/| |
* | | Merge pull request #1050 from MetaMask/fixConfTxBalanceLogickumavis2017-01-252-1/+2
|\ \ \
| * | | fix baseFrankie2017-01-251-2/+2
| * | | add to CHANGELOGFrankie2017-01-251-0/+1
| * | | Fix issue where ConfTx view lets you approve txs when the account has insuffi...Frankie2017-01-251-1/+1
* | | | Merge pull request #1051 from MetaMask/hotfix1048Frankie2017-01-252-5/+7
|\ \ \ \ | |/ / / |/| | |
| | * | background controller - extract KeyringC.placeSeedWords to MetamaskCkumavis2017-01-254-23/+34
| | * | merge master hotfix into devkumavis2017-01-252-2/+5
| | |\ \
| | | * \ Merge pull request #1053 from MetaMask/3.1.2v3.1.2kumavis2017-01-252-1/+6
| | | |\ \
| | | | * | 3.1.2kumavis2017-01-252-1/+6
| | | |/ /
| | | * | Merge pull request #1052 from MetaMask/hotfix1048kumavis2017-01-252-5/+7
| | | |\ \ | | |_|/ / | |/| | |
| * | | | hotfix - dont assume hd keyring positionkumavis2017-01-252-5/+7
| | |/ / | |/| |
| | * | keyring-controller - cleanupkumavis2017-01-251-2/+3
| | * | keyring-controller - cleanupkumavis2017-01-251-5/+3
| | * | add to CHANGELOGFrankie2017-01-251-0/+2
| | * | 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-254-6/+15
| |/ /
| | * Merge branch 'dev' into obs-store2kumavis2017-01-2249-308/+1406
| | |\ | |_|/ |/| |
* | | Merge pull request #1042 from MetaMask/upToDatekumavis2017-01-212-1/+4
|\ \ \
| * | | Merge branch 'master' into upToDateFrankie2017-01-212-1/+4
|/| | | | |/ /
| * | Merge pull request #1040 from MetaMask/3.1.1v3.1.1kumavis2017-01-212-1/+5
| |\ \
| | * | 3.1.1kumavis2017-01-212-1/+5
| |/ /
* | | Merge pull request #1039 from MetaMask/upToDatekumavis2017-01-211-1/+3
|\ \ \
| * | | Merge branch 'master' into upToDateFrankie2017-01-211-1/+3
|/| | | | |/ /
| * | Merge pull request #1037 from MetaMask/i1034-seed-exportFrankie2017-01-211-1/+3
| |\ \
| | * | keyring controller - placeSeedWords should use first hdKeyringkumavis2017-01-211-1/+3
| |/ /
* | | Merge pull request #1029 from MetaMask/i715-AddJsonImportKevin Serrano2017-01-2011-11/+165
|\ \ \
| * | | Bump changelogDan Finlay2017-01-191-0/+2
| * | | Merge branch 'dev' into i715-AddJsonImportDan Finlay2017-01-194-3/+6
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1030 from MetaMask/masterkumavis2017-01-194-3/+6
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #1027 from MetaMask/Version-3.1.0v3.1.0Dan Finlay2017-01-1933-79/+875
| |\ \ \
| | * \ \ Merge branch 'master' into Version-3.1.0Dan Finlay2017-01-193-2/+3
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #1024 from MetaMask/fixSignedVsSubmittedDan Finlay2017-01-193-2/+4
| |\ \ \ \
| | * | | | Add to CHANGELOGFrankie2017-01-191-0/+2
| | * | | | Merge branch 'master' into fixSignedVsSubmittedFrankie2017-01-1910-21/+28
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix the dissplay for submitted transactions and the listner wating to hear wh...Frankie2017-01-192-2/+2
| | | * | | Version 3.1.0Dan Finlay2017-01-192-1/+3
| |_|/ / / |/| | | |
| | | * | Add ability to import v3 JSON walletsDan Finlay2017-01-195-10/+27
| | | * | Implement naieve JSON file importingDan Finlay2017-01-193-5/+77
| | | * | Added new modular private key import systemDan Finlay2017-01-194-2/+65
| |_|/ / |/| | |
* | | | Merge pull request #1022 from MetaMask/i715-AddImportMenukumavis2017-01-1926-49/+828
|\ \ \ \
| * \ \ \ Merge branch 'dev' into i715-AddImportMenukumavis2017-01-191-0/+1
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1026 from MetaMask/i1023-badTxHashDan Finlay2017-01-191-0/+2
|\ \ \ \ \
| * | | | | Bump changelogDan Finlay2017-01-191-0/+2
| | * | | | Merge branch 'dev' into i715-AddImportMenukumavis2017-01-191-6/+5
| | |\ \ \ \ | |_|/ / / / |/| | | | |
* | | | | | Merge pull request #1025 from MetaMask/i1023-badTxHashDan Finlay2017-01-191-6/+5
|\| | | | |
| * | | | | tx-manager - use rpc-specified txHashkumavis2017-01-191-6/+5
|/ / / / /
| * | | | Fix test to log out despite number of menu itemsDan Finlay2017-01-182-2/+3
| * | | | Bump changelogDan Finlay2017-01-181-0/+2
| * | | | Remove outdated referenceDan Finlay2017-01-181-4/+0
| * | | | Remove unused UI filesDan Finlay2017-01-182-109/+0
| * | | | Allow importing of private key stringsDan Finlay2017-01-1810-16/+357
| * | | | Merge branch 'i328-MultiVault-v1' into i715-AddImportMenuDan Finlay2017-01-1819-74/+560
| |\ \ \ \
| | * | | | Develop import subviewsDan Finlay2016-11-056-17/+87
| | * | | | Add import account placeholder templateDan Finlay2016-11-054-30/+72
| | * | | | Add babelify to gulp buildDan Finlay2016-11-051-0/+4
| | * | | | LintedDan Finlay2016-11-053-12/+8
| | * | | | Add account adding subview placeholdersDan Finlay2016-11-054-39/+121
| | * | | | Merge branch 'i328-MultiVault' into i328-MultiVault-v1Dan Finlay2016-11-051-21/+1
| | |\ \ \ \
| | * | | | | Remove unused classDan Finlay2016-11-051-1/+1
| | * | | | | Convert buy subview to new tab bar componentDan Finlay2016-11-051-36/+47
| | * | | | | Scaffold new account viewDan Finlay2016-11-059-2/+192
| * | | | | | Add "import account" menu item + template viewDan Finlay2017-01-184-0/+63
|/ / / / / /
* | | | | | Merge pull request #1017 from MetaMask/conversion-api-errDan Finlay2017-01-182-3/+3
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'dev' into conversion-api-errDan Finlay2017-01-1828-261/+413
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #1019 from MetaMask/i1014-FixSigningDan Finlay2017-01-185-7/+17
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'dev' into i1014-FixSigningkumavis2017-01-171-12/+0
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #1016 from MetaMask/i1014-FixSigningkumavis2017-01-172-2/+19
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'dev' into i1014-FixSigningkumavis2017-01-171-12/+0
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #1012 from MetaMask/RemoveOldNoticekumavis2017-01-171-12/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove old noticeDan Finlay2017-01-171-12/+0
| | |_|_|_|_|/ / / | |/| | | | | | |
| | | * | | | | | Version 3.0.1Dan Finlay2017-01-172-1/+3
| | | * | | | | | Fix bug where signed messages were not dismissedDan Finlay2017-01-171-0/+1
| | | * | | | | | Fix removeHexPrefix to stripHexPrefixDan Finlay2017-01-171-1/+1
| | | * | | | | | Fix message signing UI renderingDan Finlay2017-01-171-5/+10
| | | * | | | | | Bump changelogDan Finlay2017-01-171-0/+2
| | |/ / / / / /
| | * | | | | | Wrote fix for eth.signDan Finlay2017-01-171-2/+1
| | * | | | | | Wrote failing test for eth.signDan Finlay2017-01-171-0/+18
| |/ / / / / /
| * | | | | | Merge pull request #1011 from MetaMask/devkumavis2017-01-170-0/+0
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #1010 from MetaMask/masterkumavis2017-01-171-1/+1
|\| | | | | |
| * | | | | | Merge pull request #1009 from MetaMask/FixManifestkumavis2017-01-171-1/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into FixManifestkumavis2017-01-170-0/+0
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #1005 from MetaMask/devkumavis2017-01-17132-1609/+10269
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| | * | | | | | Fix manifest versionDan Finlay2017-01-171-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #1008 from MetaMask/Version-3.0.0v3.0.0Dan Finlay2017-01-172-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Version 3.0.0Dan Finlay2017-01-172-1/+3
|/ / / / / / /
* | | | | | | Merge pull request #1007 from MetaMask/simple-keystore-fixDan Finlay2017-01-172-9/+9
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'dev' into simple-keystore-fixkumavis2017-01-176-9/+11
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Bump changelog to mention BIP44 fixDan Finlay2017-01-171-0/+1
* | | | | | | | Merge branch 'master' into devDan Finlay2017-01-176-9/+10
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #984 from MetaMask/correctCoinbaseInfoDan Finlay2017-01-113-5/+6
| |\ \ \ \ \ \ \
| | * | | | | | | add to CHANGELOGFrankie2017-01-111-0/+1
| | * | | | | | | update coinbase info and viewFrankie2017-01-112-5/+5
| |/ / / / / / /
| * | | | | | | Merge pull request #943 from MetaMask/fixExplorerLinkDan Finlay2016-12-214-4/+4
| |\ \ \ \ \ \ \
| | * | | | | | | make CHANGELOG more human readableFrankie2016-12-211-1/+1
| | * | | | | | | Add to CHANGELOG.mdFrances Pangilinan2016-12-211-0/+1
| | * | | | | | | remove network Id 2 from explorer link and Add network Id 3Frances Pangilinan2016-12-213-4/+3
| |/ / / / / / /
| | * | | | | | test - keyring - simple - fix fixture datakumavis2017-01-171-6/+3
| | * | | | | | keyring - simple - throw error if wallet not found for addresskumavis2017-01-171-1/+4
| | * | | | | | keyring - simple - fix address generationkumavis2017-01-171-3/+3
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #1004 from MetaMask/doubleRenderIssueDan Finlay2017-01-172-2/+5
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | add to CHANGELOGFrankie2017-01-151-0/+1
| * | | | | | Dont render conf-tx if their are no txParams to showFrankie2017-01-151-2/+4
|/ / / / / /
* | | | | | Merge pull request #1002 from MetaMask/bug-submitTxFrankie2017-01-1510-160/+258
|\ \ \ \ \ \
| * | | | | | test - clear localStorage on test startkumavis2017-01-151-3/+3
| * | | | | | test - clear localStorage in case CI caches it (?)kumavis2017-01-151-0/+1
| * | | | | | test - txManager - add network to all txskumavis2017-01-151-18/+19
| * | | | | | tests - txManager - add getNetwork fn to fixture txManagerkumavis2017-01-151-0/+1
| * | | | | | 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-142-2/+3
| * | | | | | 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-1411-65/+96
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'dev' into bug-submitTxkumavis2017-01-1411-65/+96
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #997 from MetaMask/integrateTxManagerUIkumavis2017-01-1411-66/+99
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'dev' into integrateTxManagerUIFrankie2017-01-141-2/+2
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | remove orphaned commentFrankie2017-01-141-1/+0
| * | | | | | | | lintFrankie2017-01-141-1/+1
| * | | | | | | | Clean up codeFrankie2017-01-144-34/+39
| * | | | | | | | Fix sorting and instances where something could be undefinedFrankie2017-01-123-4/+5
| * | | | | | | | Merge branch 'dev' into integrateTxManagerUIFrankie2017-01-122-6/+5
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix wording and icon of failed txsFrankie2017-01-123-15/+22
| * | | | | | | | | Add to CHANGELOGFrankie2017-01-122-2/+9
| * | | | | | | | | Merge branch 'dev' into integrateTxManagerUIFrankie2017-01-128-78/+102
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Take some of the tx Logic out of the UI and create a visble state for pending...Frankie2017-01-1210-54/+68
| | | | * | | | | | | background - metamask controller - fix 'this' refkumavis2017-01-141-7/+8
| | | | |/ / / / / /
| | | | * / / / / / background - handle tx finalization in controllers instead of provider-enginekumavis2017-01-137-131/+215
| |_|_|/ / / / / / |/| | | | | | | |
| | | | | * | | | lint - warn on unhandled errkumavis2017-01-121-2/+2
| | | | | * | | | 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-127-136/+204
| | | | | | | * background - move pojo migrator to outside of metamask controllerkumavis2017-01-1215-244/+231
| | | | | | | * test - fix tests from obs-storekumavis2017-01-123-8/+13
| | | | | | | * background - introduce ObservableStorekumavis2017-01-1211-187/+224
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #998 from MetaMask/i960-port-stream-errkumavis2017-01-121-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | bugfix - portstream - dont wrap cb in try catchkumavis2017-01-121-2/+2
|/ / / / / /
* | | | | | Merge pull request #996 from MetaMask/i981-UpdateOnAccountChangekumavis2017-01-122-6/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Send update to UI when changing selected accountDan Finlay2017-01-122-6/+5
|/ / / / /
* | | | | Merge pull request #990 from MetaMask/sync-accountsDan Finlay2017-01-121-17/+1
|\ \ \ \ \
| * | | | | rpc - fix sync account cache settingkumavis2017-01-111-17/+1
* | | | | | Merge pull request #988 from MetaMask/eth_syncingkumavis2017-01-112-0/+7
|\| | | | |
| * | | | | changelog - add note on rpc overrideskumavis2017-01-111-0/+2
| * | | | | web3 provider - override eth_syncing and web3_clientVersionkumavis2017-01-111-0/+5
|/ / / / /
* | | | | Merge pull request #987 from MetaMask/kumavis-patch-1kumavis2017-01-111-1/+1
|\ \ \ \ \
| * | | | | deps - bump provider enginekumavis2017-01-111-1/+1
|/ / / / /
* | | | | Merge pull request #985 from MetaMask/gulp1kumavis2017-01-113-39/+83
|\ \ \ \ \
| * \ \ \ \ Merge branch 'dev' into gulp1Dan Finlay2017-01-115-21/+10
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #986 from MetaMask/i947-BrowserSolidityErrorkumavis2017-01-112-15/+3
|\ \ \ \ \ \
| * | | | | | Bump changelogDan Finlay2017-01-111-0/+1
| * | | | | | Remove erroneous OOG estimation logic.Dan Finlay2017-01-111-15/+2
|/ / / / / /
* | | | | | Merge pull request #983 from MetaMask/slim1Kevin Serrano2017-01-113-6/+7
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | tests - add fetch polyfillkumavis2017-01-112-1/+4
| * | | | | deps - replace promise-request with fetchkumavis2017-01-112-5/+3
|/ / / / /
| * | | | gulp - fix brfs instrumentationkumavis2017-01-112-5/+2
| * | | | gulp - cleanup commentskumavis2017-01-111-13/+19
| * | | | gulp - add disc bundle analysis taskkumavis2017-01-113-5/+55
| * | | | gulp - clean and simplifykumavis2017-01-112-25/+16
|/ / / /
* | | | Merge pull request #974 from MetaMask/typo-fixFrankie2017-01-071-2/+2
|\ \ \ \
| * | | | quick typo fix.Kevin Serrano2017-01-071-2/+2
|/ / / /
* | | | Merge pull request #970 from MetaMask/network-indicator-refactorDan Finlay2017-01-065-16/+24
|\ \ \ \
| * \ \ \ Merge branch 'dev' into network-indicator-refactorKevin Serrano2017-01-067-45/+188
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #971 from MetaMask/TearDownOnDisconnectkumavis2017-01-062-11/+8
|\ \ \ \ \
| * \ \ \ \ Merge branch 'dev' into TearDownOnDisconnectkumavis2017-01-064-31/+34
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #967 from MetaMask/fixTxManagerDan Finlay2017-01-064-32/+34
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'dev' into fixTxManagerDan Finlay2017-01-064-2/+146
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Combine two identical then blocksDan Finlay2017-01-061-4/+2
| * | | | | | remove unnecessary try statmentsFrankie2017-01-053-37/+24
| * | | | | | Merge branch 'TxManager' into fixTxManagerFrankie2017-01-051-0/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'TxManager' of https://github.com/MetaMask/metamask-plugin into ...Frankie2017-01-053-22/+31
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge pull request #958 from MetaMask/i897-ReplayProtectionKevin Serrano2017-01-0415-70/+328
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge branch 'dev' into i897-ReplayProtectionDan Finlay2017-01-0311-48/+259
| | | | |\ \ \ \ \ \
| | | | * | | | | | | Use chainId parameter instead of second argumentDan Finlay2017-01-031-1/+2
| | | | * | | | | | | LintedDan Finlay2017-01-031-2/+2
| | | | * | | | | | | Bump changelogDan Finlay2017-01-031-0/+1
| | | | * | | | | | | Add replay protection to Transaction ManagerDan Finlay2017-01-032-23/+30
| * | | | | | | | | | clean upFrankie2017-01-051-1/+1
| * | | | | | | | | | Merge branch 'dev' into fixtTxManagerFrankie2017-01-0515-100/+324
| |\| | | | | | | | |
| * | | | | | | | | | Fix signing of transactionsFrankie2017-01-053-46/+62
| | |_|/ / / / / / / | |/| | | | | | | |
| | | | | * | | | | Merge branch 'dev' into TearDownOnDisconnectkumavis2017-01-064-2/+146
| | | | | |\ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #969 from MetaMask/i945-AlwaysQueryLatestKevin Serrano2017-01-064-2/+146
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | 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
| * | | | | | | | | Bump changelogDan Finlay2017-01-051-0/+1
| * | | | | | | | | Remove old eth-store dependencyDan Finlay2017-01-051-1/+0
| * | | | | | | | | 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
|/ / / / / / / / /
| | | | * / / / / MetaMask Controller - Convert to EventEmitterFrankie2017-01-062-12/+8
| |_|_|/ / / / / |/| | | | | | |
| | | | * | | | Switch order of header and indicator.Kevin Serrano2017-01-061-1/+1
| | | | * | | | Changelog.Kevin Serrano2017-01-051-0/+2
| | | | * | | | Linting.Kevin Serrano2017-01-052-2/+1
| | | | * | | | Make network somewhat more modular, add new network indicator.Kevin Serrano2017-01-054-17/+24
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge pull request #965 from MetaMask/chrome-permissionsDan Finlay2017-01-043-4/+29
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'dev' of github.com:MetaMask/metamask-plugin into devKevin Serrano2017-01-041-2/+8
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #964 from MetaMask/i963-BalancesNotUpdatingKevin Serrano2017-01-041-2/+8
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'dev' into i963-BalancesNotUpdatingKevin Serrano2017-01-041-46/+28
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix sendUpdate for new promisified getState methodDan Finlay2017-01-041-2/+6
| * | | | | | | | Update UI state on ethStore updatesDan Finlay2017-01-041-0/+2
| | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Merge branch 'dev' of github.com:MetaMask/metamask-plugin into devKevin Serrano2017-01-041-46/+28
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #962 from MetaMask/i961-UpdateUiBugKevin Serrano2017-01-041-46/+28
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Convert more actions to new simple patternDan Finlay2017-01-041-18/+2
| * | | | | | | Restore missing lineDan Finlay2017-01-041-0/+1
| * | | | | | | Corrected instances of showWarning to displayWarningDan Finlay2017-01-041-3/+3
| * | | | | | | Apply new pattern to repetitive functionsDan Finlay2017-01-041-19/+2
| * | | | | | | Update account list after adding accountDan Finlay2017-01-041-10/+24
|/ / / / / / /
| * | | | | | Changelog.Kevin Serrano2017-01-041-1/+1
| * | | | | | Changelog.Kevin Serrano2017-01-041-0/+1
| * | | | | | Take out unneeded permissions from the app.Kevin Serrano2017-01-042-4/+28
|/ / / / / /
* | | | | | Merge remote-tracking branch 'origin/ShowDifferentAccounts' into RevertTxManagerDan Finlay2017-01-033-7/+7
|\ \ \ \ \ \
| * | | | | | Make single letter variables more verboseDan Finlay2017-01-032-5/+5
| * | | | | | Merge branch 'dev' into ShowDifferentAccountsDan Finlay2017-01-0320-657/+669
| |\| | | | |
| | * | | | | Merge pull request #954 from MetaMask/kumavis-readme-gourceFrankie2017-01-031-0/+36
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge pull request #955 from MetaMask/i727-provider-is-metamaskFrankie2017-01-031-0/+2
| | |\ \ \ \ \ \
| * | | | | | | | Add tolerance for hex prefixed private keys to simple keychainDan Finlay2017-01-031-3/+4
* | | | | | | | | Merge remote-tracking branch 'origin/i727-provider-is-metamask' into RevertTx...Dan Finlay2017-01-031-0/+2
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | inpage-provider - add isMetaMaskkumavis2017-01-031-0/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge remote-tracking branch 'origin/kumavis-readme-gource' into RevertTxManagerDan Finlay2017-01-0319-655/+666
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | meta - readme - add gource instructionskumavis2017-01-031-0/+36
| |/ / / / /
| * | | | | Merge pull request #921 from MetaMask/TxManagerkumavis2017-01-0318-657/+631
| |\| | | |
| | * | | | Merge branch 'dev' into TxManagerFrankie2016-12-2415-197/+318
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | fix some minor spelling mistakes and clean up codeFrankie2016-12-244-34/+32
| | * | | | fix mergeFrances Pangilinan2016-12-221-1/+1
| | * | | | Merge branch 'dev' into TxManagerFrankie2016-12-2238-362/+813
| | |\ \ \ \
| | * | | | | Remove txManager in keyring controllerFrances Pangilinan2016-12-221-2/+0
| | * | | | | Migrate all tx mutation code out of keyring controller andFrances Pangilinan2016-12-224-54/+71
| | * | | | | First pass at revision requestsFrances Pangilinan2016-12-2213-595/+239
| | * | | | | Clean up and comment functionsFrances Pangilinan2016-12-152-10/+31
| | * | | | | add to CHANGELOG.mdFrances Pangilinan2016-12-151-0/+1
| | * | | | | add Test for txManager. As well as fix tests to account for txManager.Frances Pangilinan2016-12-156-80/+185
| | * | | | | Create a TxManagerFrances Pangilinan2016-12-157-159/+350
* | | | | | | Correct getState test to be asyncDan Finlay2016-12-241-4/+7
* | | | | | | Fix rendering of loose accountsDan Finlay2016-12-242-3/+5
* | | | | | | Add loose account development stateDan Finlay2016-12-241-0/+126
* | | | | | | Merge branch 'FixMigrationPasswordBug' into ShowDifferentAccountsDan Finlay2016-12-243-4/+22
|\ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 10:54:11 +0800