Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove encryptor in favor of external browser-passworder | Dan Finlay | 2016-12-20 | 4 | -228/+3 |
* | Merge pull request #937 from MetaMask/i900-forgot-password-flow | Dan Finlay | 2016-12-20 | 8 | -26/+32 |
|\ | |||||
| * | Modify actions to support better transition. | Kevin Serrano | 2016-12-20 | 3 | -1/+18 |
| * | Add to changelog. | Kevin Serrano | 2016-12-20 | 1 | -0/+1 |
| * | Lint. | Kevin Serrano | 2016-12-20 | 3 | -6/+5 |
| * | Redirect to seed word screen for forgotten passwords. | Kevin Serrano | 2016-12-20 | 4 | -20/+9 |
* | | Merge pull request #936 from MetaMask/MergeMaster | kumavis | 2016-12-20 | 25 | -54/+626 |
|\ \ | |/ |/| | |||||
| * | Merged master into dev | Dan Finlay | 2016-12-20 | 25 | -54/+626 |
|/| | |||||
| * | Merge pull request #935 from MetaMask/kumavis-patch-1 | Dan Finlay | 2016-12-20 | 2 | -8/+11 |
| |\ | |||||
| | * | changelog - add whitespace | kumavis | 2016-12-20 | 1 | -0/+1 |
| | * | Merge branch 'kumavis-patch-1' of github.com:MetaMask/metamask-plugin into ku... | kumavis | 2016-12-20 | 0 | -0/+0 |
| | |\ | |||||
| | | * | Merge branch 'kumavis-patch-1' of github.com:MetaMask/metamask-plugin into ku... | kumavis | 2016-12-20 | 2 | -4/+6 |
| | | |\ | |||||
| | | | * | Merge branch 'master' into kumavis-patch-1 | kumavis | 2016-12-20 | 2 | -4/+5 |
| | | | |\ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge pull request #929 from MetaMask/Version-2.14.0 | Dan Finlay | 2016-12-20 | 2 | -4/+5 |
| |\ \ \ \ | |||||
| | * | | | | Version 2.14.02.14.0 | Dan Finlay | 2016-12-17 | 2 | -4/+5 |
| |/ / / / | |||||
| | * / / | changelog - inf reload detection hotfix | kumavis | 2016-12-20 | 2 | -4/+6 |
| | |/ / | |||||
| | * / | changelog - add note on inf reload detection hotfix | kumavis | 2016-12-20 | 1 | -1/+1 |
| | |/ | |||||
| | * | inpage - temporarily disable ping stream | kumavis | 2016-12-20 | 1 | -8/+9 |
| |/ | |||||
| * | Merge pull request #927 from MetaMask/AddNotices | Dan Finlay | 2016-12-17 | 19 | -21/+607 |
| |\ | |||||
| | * | Clean up first notice | Dan Finlay | 2016-12-17 | 2 | -2/+2 |
| | * | Add date to notices display. | Kevin Serrano | 2016-12-17 | 1 | -1/+15 |
| | * | move notice code from metamask-controller + config-manager, in to notice-cont... | kumavis | 2016-12-17 | 5 | -205/+213 |
| | * | meta - add npm-debug.log to gitignore | kumavis | 2016-12-17 | 1 | -0/+1 |
| | * | clean - code style | kumavis | 2016-12-17 | 2 | -8/+3 |
| | * | Deactivate polling for now. | Kevin Serrano | 2016-12-17 | 1 | -1/+3 |
| | * | Merge branch 'AddNotices' of github.com:MetaMask/metamask-plugin into AddNotices | Dan Finlay | 2016-12-17 | 2 | -1/+12 |
| | |\ | |||||
| | | * | remove duplicate controller. | Kevin Serrano | 2016-12-17 | 1 | -3/+0 |
| | | * | Clean notices. | Kevin Serrano | 2016-12-17 | 1 | -1/+1 |
| | | * | The first notice, the fall of morden. | Kevin Serrano | 2016-12-17 | 2 | -1/+12 |
| | * | | Cleanup | Dan Finlay | 2016-12-17 | 3 | -4/+1 |
| | |/ | |||||
| | * | Rebuild development states before ci tests | Dan Finlay | 2016-12-17 | 1 | -2/+3 |
| | * | Add ability to show notices to user & get confirmation. | Kevin Serrano | 2016-12-17 | 4 | -20/+27 |
| | * | Add ability to show notices to user & get confirmation. | Kevin Serrano | 2016-12-17 | 17 | -4/+554 |
| |/ | |||||
| * | Merge pull request #923 from MetaMask/RemoveMorden | Frankie | 2016-12-17 | 6 | -27/+3 |
| |\ | |||||
| | * | Bump changelog for removing morden | Dan Finlay | 2016-12-16 | 1 | -0/+1 |
| | * | Remove morden testnet provider | Dan Finlay | 2016-12-16 | 5 | -27/+2 |
| |/ | |||||
| * | Merge pull request #918 from MetaMask/i915-txPermaCache | kumavis | 2016-12-13 | 2 | -1/+2 |
| |\ | |||||
| | * | deps - bump provider-engine for bug fix | kumavis | 2016-12-13 | 2 | -1/+2 |
| |/ | |||||
| * | Merge pull request #912 from MetaMask/kumavis-patch-1 | Dan Finlay | 2016-12-08 | 1 | -0/+2 |
| |\ | |||||
| | * | changelog - "fix reload detection" | kumavis | 2016-12-08 | 1 | -0/+2 |
| |/ | |||||
| * | Merge pull request #911 from MetaMask/i873-reloadBroken | Dan Finlay | 2016-12-08 | 1 | -1/+1 |
| |\ | |||||
| | * | inpage - correctly listen for incomming messages | kumavis | 2016-12-08 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #891 from MetaMask/Version-2.13.11 | Dan Finlay | 2016-11-29 | 2 | -1/+3 |
| |\ | |||||
| | * | Version 2.13.112.13.11 | Dan Finlay | 2016-11-24 | 2 | -1/+3 |
| |/ | |||||
* | | Merge pull request #926 from MetaMask/revert-920-dev | Dan Finlay | 2016-12-17 | 11 | -54/+101 |
|\ \ | |||||
| * | | Revert "Interface enhancements" | Dan Finlay | 2016-12-17 | 11 | -54/+101 |
|/ / | |||||
* | | Merge pull request #920 from luisivan/dev | Dan Finlay | 2016-12-15 | 11 | -101/+54 |
|\ \ | |||||
| * | | Fixed header h1 alignment and network name | Luis Iván Cuende | 2016-12-15 | 2 | -5/+3 |
| * | | Better account details view | Luis Iván Cuende | 2016-12-15 | 5 | -42/+14 |
| * | | Better editable label | Luis Iván Cuende | 2016-12-15 | 5 | -40/+15 |
| * | | Better buttons | Luis Iván Cuende | 2016-12-14 | 2 | -4/+9 |
| * | | Beautified disclaimer | Luis Iván Cuende | 2016-12-14 | 3 | -11/+14 |
|/ / | |||||
* | | Merge pull request #914 from MetaMask/FixUnitTestSuite | Dan Finlay | 2016-12-09 | 2 | -2/+2 |
|\ \ | |||||
| * | | Cranked up CI test suite wait duration to alleviate their nondeterminism for now | Dan Finlay | 2016-12-08 | 1 | -1/+1 |
| * | | Remove .only from unit test suite | Dan Finlay | 2016-12-08 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #904 from MetaMask/BetterIntegrationTest | kumavis | 2016-12-02 | 9 | -18/+161 |
|\ \ | |||||
| * | | Remove redundant logging block | Dan Finlay | 2016-12-02 | 1 | -3/+0 |
| * | | Fix vault encrypting & unlocking bug | Dan Finlay | 2016-12-01 | 6 | -13/+53 |
| * | | Add integration tests for logging out and back in | Dan Finlay | 2016-12-01 | 2 | -2/+29 |
| * | | Add more integration tests | Dan Finlay | 2016-12-01 | 1 | -0/+25 |
| * | | Made integration test create a first vault | Dan Finlay | 2016-12-01 | 5 | -4/+58 |
|/ / | |||||
* | | Merge pull request #899 from MetaMask/i893-DenodeifyKeyringController | Kevin Serrano | 2016-11-30 | 2 | -3/+10 |
|\ \ | |||||
| * | | Add useful nodeify error message | Dan Finlay | 2016-11-30 | 1 | -2/+9 |
| * | | Return promise correctly from setSelectedAddress | Dan Finlay | 2016-11-30 | 1 | -1/+1 |
* | | | Merge pull request #896 from MetaMask/i893-DenodeifyKeyringController | Kevin Serrano | 2016-11-30 | 9 | -458/+722 |
|\| | | |||||
| * | | Flattened addTx async methods | Dan Finlay | 2016-11-30 | 2 | -90/+83 |
| * | | Bind ethQuery to estimateGas to allow it to be moved around. | Dan Finlay | 2016-11-30 | 1 | -2/+2 |
| * | | Fix tx adding code | Dan Finlay | 2016-11-30 | 2 | -50/+3 |
| * | | Ordered keyringController methods the same in metamask-controller | Dan Finlay | 2016-11-30 | 2 | -5/+9 |
| * | | Annotated KeyringController | Dan Finlay | 2016-11-30 | 1 | -219/+496 |
| * | | Remove unused dep | Dan Finlay | 2016-11-29 | 1 | -1/+0 |
| * | | Fix nodeify usage | Dan Finlay | 2016-11-29 | 1 | -11/+11 |
| * | | Fix nodeify | Dan Finlay | 2016-11-29 | 2 | -55/+35 |
| * | | Denodeify most of KeyringController | Dan Finlay | 2016-11-29 | 7 | -172/+230 |
* | | | Merge pull request #890 from MetaMask/MergeMasterIntoDev | Kevin Serrano | 2016-11-29 | 6 | -33/+72 |
|\| | | |||||
| * | | Merge branch 'master' into dev | Dan Finlay | 2016-11-24 | 6 | -33/+72 |
|/| | | |/ | |||||
| * | Merge pull request #884 from MetaMask/i883-sync-uninstallFilter | kumavis | 2016-11-24 | 2 | -0/+9 |
| |\ | |||||
| | * | changelog - add sync rpc eth_uninstallFilter note | kumavis | 2016-11-24 | 1 | -0/+2 |
| | * | rpc - add sync uninstallFilter support | kumavis | 2016-11-24 | 1 | -0/+7 |
| |/ | |||||
| * | Merge pull request #876 from MetaMask/Version-2.13.10 | Dan Finlay | 2016-11-23 | 2 | -3/+7 |
| |\ | |||||
| | * | Version 2.13.102.13.10 | Dan Finlay | 2016-11-23 | 2 | -3/+7 |
| |/ | |||||
| * | Merge pull request #872 from MetaMask/i868-estimateGasTooHigh | kumavis | 2016-11-23 | 2 | -29/+50 |
| |\ | |||||
| | * | Merge branch 'master' into i868-estimateGasTooHigh | kumavis | 2016-11-23 | 5 | -8/+17 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #864 from MetaMask/new-faucet | kumavis | 2016-11-23 | 3 | -4/+5 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into new-faucet | Dan Finlay | 2016-11-23 | 3 | -4/+12 |
| | |\ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #855 from MetaMask/i834-RopstenLinks | Kevin Serrano | 2016-11-23 | 3 | -4/+12 |
| |\ \ \ | |||||
| | * | | | Unify test wording | Dan Finlay | 2016-11-22 | 1 | -2/+2 |
| | * | | | Add temporary morden explorer link support | Dan Finlay | 2016-11-22 | 2 | -1/+7 |
| | * | | | Fix ropsten link test | Dan Finlay | 2016-11-22 | 1 | -2/+2 |
| | * | | | Bump changelog | Dan Finlay | 2016-11-22 | 1 | -0/+2 |
| | * | | | Merge branch 'master' into i834-RopstenLinks | Dan Finlay | 2016-11-22 | 2 | -1/+3 |
| | |\ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Add ropsten link support | Dan Finlay | 2016-11-22 | 1 | -2/+2 |
| | | * | | Ropsten has sole access to the faucet. | Kevin Serrano | 2016-11-23 | 2 | -4/+4 |
| | | * | | Add to changelog. | Kevin Serrano | 2016-11-23 | 3 | -2/+3 |
| | |/ / | |/| | | |||||
| | | * | idStore - fix estimateGas calculation | kumavis | 2016-11-23 | 2 | -29/+50 |
| | |/ | |/| | |||||
| * | | Merge pull request #838 from MetaMask/Version-2.13.9 | kumavis | 2016-11-22 | 2 | -1/+3 |
| |\ \ | | |/ | |/| | |||||
| | * | Version 2.13.92.13.9 | Dan Finlay | 2016-11-22 | 2 | -1/+3 |
| |/ | |||||
| * | Merge pull request #832 from MetaMask/i831-AddRopsten | Kevin Serrano | 2016-11-22 | 8 | -4/+42 |
| |\ | |||||
* | \ | Merge pull request #887 from MetaMask/i865-erabe | Kevin Serrano | 2016-11-24 | 5 | -37/+20 |
|\ \ \ | |||||
| * | | | Cosmetic changes, rename links. | Kevin Serrano | 2016-11-24 | 1 | -9/+9 |
| * | | | Add link back to unlock. | Kevin Serrano | 2016-11-24 | 1 | -0/+16 |
| * | | | Fix proper behavior for restoring accounts when password forgotten. | Kevin Serrano | 2016-11-24 | 2 | -0/+2 |
| * | | | Modify forgot password flow to go back to init screen. | Kevin Serrano | 2016-11-24 | 2 | -36/+1 |
* | | | | Merge pull request #888 from MetaMask/i844-AsyncKeyrings | Kevin Serrano | 2016-11-24 | 6 | -144/+236 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix last async keyring test | Dan Finlay | 2016-11-24 | 1 | -8/+10 |
| * | | | Fix more async usage of KeyringController | Dan Finlay | 2016-11-24 | 1 | -25/+32 |
| * | | | Fix more keyring asyncifying tests | Dan Finlay | 2016-11-24 | 2 | -3/+11 |
| * | | | Mostly got async keyringController tests passing | Dan Finlay | 2016-11-23 | 4 | -62/+100 |
| * | | | Complete first pass at asyncrhonizing keyring controller | Dan Finlay | 2016-11-23 | 1 | -31/+53 |
| * | | | Asynced keyrings and started on controller | Dan Finlay | 2016-11-23 | 3 | -32/+47 |
|/ / / | |||||
* | | | Merge pull request #879 from MetaMask/i843-MoveSaltIntoEncryptor | Kevin Serrano | 2016-11-23 | 5 | -6/+21 |
|\ \ \ | |||||
| * | | | Fix new encryptor migration logic | Dan Finlay | 2016-11-23 | 3 | -3/+13 |
| * | | | Fix undefined provider menu item | Dan Finlay | 2016-11-23 | 1 | -2/+5 |
| * | | | Fix password reference | Dan Finlay | 2016-11-23 | 2 | -1/+3 |
* | | | | Merge pull request #878 from MetaMask/i843-MoveSaltIntoEncryptor | Dan Finlay | 2016-11-23 | 4 | -49/+42 |
|\| | | | |||||
| * | | | Remove line of cruft | Dan Finlay | 2016-11-23 | 1 | -1/+0 |
| * | | | Fix vault migration unit test | Dan Finlay | 2016-11-23 | 1 | -1/+1 |
| * | | | Improve vault migration unit test | Dan Finlay | 2016-11-23 | 1 | -1/+2 |
| * | | | Refine isInitialized derivation method | Dan Finlay | 2016-11-23 | 1 | -1/+1 |
| * | | | Linted | Dan Finlay | 2016-11-23 | 1 | -1/+1 |
| * | | | Simplify Encryptor API Surface | Dan Finlay | 2016-11-23 | 3 | -49/+37 |
| * | | | Merge branch 'dev' into i843-MoveSaltIntoEncryptor | Dan Finlay | 2016-11-23 | 48 | -138/+234 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #875 from MetaMask/i868-estimateGasTooHigh-dev | Dan Finlay | 2016-11-23 | 2 | -5/+62 |
|\ \ \ \ | |||||
| * | | | | KeyringController - estimateGas->analyzeGasUsage fix gasLimit + detect OOG | kumavis | 2016-11-23 | 2 | -5/+62 |
* | | | | | Merge pull request #858 from MetaMask/i842-WaitForSeedWord | kumavis | 2016-11-23 | 4 | -8/+21 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Move state update outside of conditional callback block | Dan Finlay | 2016-11-23 | 1 | -1/+1 |
| * | | | | Restore ropsten link support | Dan Finlay | 2016-11-23 | 1 | -3/+3 |
| * | | | | Remove callback type check | Dan Finlay | 2016-11-23 | 1 | -1/+1 |
| * | | | | Fix etherscan link generation test | Dan Finlay | 2016-11-23 | 1 | -2/+8 |
| * | | | | Merge branch 'dev' into i842-WaitForSeedWord | Dan Finlay | 2016-11-23 | 8 | -46/+67 |
| |\ \ \ \ | |||||
| * | | | | | Use callback in placeSeedWord method. | Dan Finlay | 2016-11-22 | 2 | -3/+10 |
* | | | | | | Merge pull request #857 from MetaMask/i841-RenameMethod | kumavis | 2016-11-23 | 2 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Rename idStoreMigrator method for clarity | Dan Finlay | 2016-11-22 | 2 | -2/+2 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #869 from MetaMask/dev-cleanup | kumavis | 2016-11-23 | 37 | -71/+77 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'dev' into dev-cleanup | Kevin Serrano | 2016-11-23 | 8 | -46/+67 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Fix camel casing on setSelectedAccount action. | Dan Finlay | 2016-11-22 | 3 | -4/+4 |
| * | | | | | | Added instructions for installing local build | Dan Finlay | 2016-11-22 | 1 | -0/+6 |
| * | | | | | | Change fauceting to become a response of an emit. | Kevin Serrano | 2016-11-22 | 3 | -4/+9 |
| * | | | | | | change all instances of selectedAddress to selectedAccount. | Kevin Serrano | 2016-11-22 | 31 | -52/+49 |
| * | | | | | | Remove entropy from encryption and project. | Kevin Serrano | 2016-11-22 | 7 | -17/+15 |
* | | | | | | | Merge pull request #871 from MetaMask/i860-ethjsremove | kumavis | 2016-11-23 | 2 | -6/+5 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Phase out ethereumjs-util from encryptor module. | Kevin Serrano | 2016-11-23 | 2 | -6/+5 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #866 from MetaMask/new-faucet-dev | Dan Finlay | 2016-11-23 | 3 | -3/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Make ropsten faucet button point at the correct url. | Kevin Serrano | 2016-11-23 | 3 | -3/+4 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #856 from MetaMask/i835-OrganizeKeyrings | Kevin Serrano | 2016-11-23 | 6 | -45/+65 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix keyring test | Dan Finlay | 2016-11-22 | 1 | -1/+1 |
| * | | | | | | Improve Keyring organization | Dan Finlay | 2016-11-22 | 5 | -42/+62 |
| | |/ / / / | |/| | | | | |||||
| | | * | | | Began moving salt into encryptor | Dan Finlay | 2016-11-23 | 1 | -5/+10 |
| | |/ / / | |/| | | | |||||
| * | | | | Revert premature link test fix | Dan Finlay | 2016-11-22 | 1 | -2/+2 |
|/ / / / | |||||
* / / / | Fixed account link test for ropsten network | Dan Finlay | 2016-11-22 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #837 from MetaMask/FixMenuItem | Kevin Serrano | 2016-11-22 | 4 | -8/+96 |
|\ \ \ | |||||
| * | | | Add development states.js back into repo | Dan Finlay | 2016-11-22 | 2 | -1/+1 |
| * | | | Fix custom provider menu item | Dan Finlay | 2016-11-22 | 5 | -8/+96 |
* | | | | Merge pull request #833 from MetaMask/i831-AddRopsten-Dev | Kevin Serrano | 2016-11-22 | 8 | -4/+41 |
|\ \ \ \ | |||||
| * | | | | Merge branch 'dev' into i831-AddRopsten-Dev | Dan Finlay | 2016-11-22 | 100 | -814/+8243 |
| |\| | | | | |_|/ | |/| | | |||||
| * | | | Begin adding Ropsten support | Dan Finlay | 2016-11-22 | 8 | -4/+42 |
| | |/ | |/| | |||||
* | | | Merge pull request #830 from MetaMask/kumavis-patch-1 | Dan Finlay | 2016-11-22 | 1 | -1/+8 |
|\ \ \ | |_|/ |/| | | |||||
| * | | meta - README - add npm start to instructions | kumavis | 2016-11-22 | 1 | -1/+8 |
|/ / | |||||
* | | Merge pull request #827 from MetaMask/currency-cleanup | Dan Finlay | 2016-11-19 | 4 | -7/+5731 |
|\ \ | |||||
| * | | Convert conversion util to pure json. | Kevin Serrano | 2016-11-19 | 4 | -7/+5731 |
* | | | Merge pull request #826 from MetaMask/mini-lint | Dan Finlay | 2016-11-19 | 2 | -3/+3 |
|\ \ \ | |/ / |/| | | |||||
| * | | Maintain linting. | Kevin Serrano | 2016-11-19 | 2 | -3/+3 |
|/ / | |||||
* | | Merge pull request #824 from MetaMask/failing-tests | Dan Finlay | 2016-11-19 | 3 | -5/+72 |
|\ \ | |||||
| * | | Promisify persistence of keyrings before returning key | Kevin Serrano | 2016-11-19 | 1 | -5/+5 |
| * | | Merge branch 'dev' into failing-tests | Kevin Serrano | 2016-11-19 | 2 | -3/+3 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #823 from MetaMask/FixBork | Kevin Serrano | 2016-11-19 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Update migration code for new hd wallet param name | Dan Finlay | 2016-11-19 | 1 | -2/+2 |
|/ / / | |||||
* | | | Persist keyrings from migration to storage. | Kevin Serrano | 2016-11-19 | 1 | -1/+1 |
| * | | Create failing test to check submitPassword in keyringController. | Kevin Serrano | 2016-11-19 | 2 | -0/+67 |
|/ / | |||||
* | | Resolve merge conflict. | Kevin Serrano | 2016-11-19 | 94 | -805/+2444 |
|\ \ | |/ |/| | |||||
| * | random-id - use Number.MAX_SAFE_INTEGER as max | kumavis | 2016-11-18 | 1 | -1/+1 |
| * | Merge pull request #816 from MetaMask/i328-MultiVault | kumavis | 2016-11-18 | 95 | -818/+2457 |
| |\ | |||||
| | * | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3... | Dan Finlay | 2016-11-18 | 66 | -306/+273 |
| | |\ | |||||
| | | * | Revert one cb to previous state. | Kevin Serrano | 2016-11-16 | 2 | -2/+2 |
| | | * | Minimize dispatches by using emitters and relying on state updates. | Kevin Serrano | 2016-11-16 | 2 | -26/+12 |
| | | * | Fix semantics in comments | Kevin Serrano | 2016-11-16 | 1 | -1/+1 |
| | | * | Lints. | Kevin Serrano | 2016-11-16 | 1 | -1/+1 |
| | | * | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3... | Kevin Serrano | 2016-11-16 | 0 | -0/+0 |
| | | |\ | |||||
| | | | * | Resolve merge conflicts. | Kevin Serrano | 2016-11-16 | 3 | -5/+5 |
| | | | |\ | |||||
| | | * | \ | Resolve merge conflicts. | Kevin Serrano | 2016-11-16 | 3 | -5/+5 |
| | | |\ \ \ | | | | |/ / | | | |/| / | | | | |/ | |||||
| | | * | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3... | Kevin Serrano | 2016-11-16 | 1 | -0/+2 |
| | | |\ \ | |||||
| | | | * | | Minimize repeated code. | Kevin Serrano | 2016-11-16 | 1 | -5/+6 |
| | | * | | | Minimize repeated code. | Kevin Serrano | 2016-11-16 | 2 | -8/+7 |
| | | |/ / | |||||
| | | * | | Re-enable disclaimer screen. Rename variables to reflect role more clearly. | Kevin Serrano | 2016-11-15 | 30 | -49/+49 |
| | | * | | Add idStore tests again. | Kevin Serrano | 2016-11-15 | 1 | -0/+198 |
| | | * | | Rename n variables to numberOfAccounts inside of test suite. Remove idStore t... | Kevin Serrano | 2016-11-12 | 3 | -203/+4 |
| | | * | | Revert to previous anonymous function for promise. | Kevin Serrano | 2016-11-12 | 1 | -1/+3 |
| | | * | | Various keyring changes | Kevin Serrano | 2016-11-12 | 1 | -18/+10 |
| | | * | | Clarify functions names. Package normalize inside util file. Fix require head... | Kevin Serrano | 2016-11-12 | 1 | -11/+8 |
| | | * | | Package normalize inside sig util file. | Kevin Serrano | 2016-11-12 | 1 | -0/+5 |
| | | * | | Fix lint rules for ternary operator placement. | Kevin Serrano | 2016-11-12 | 2 | -19/+19 |
| | | * | | Typo fix. | Kevin Serrano | 2016-11-12 | 1 | -9/+9 |
| | | * | | Linting to the max. | Kevin Serrano | 2016-11-12 | 32 | -177/+129 |
| | | * | | Merge branch 'master' into i328-MultiVault | kumavis | 2016-11-11 | 2 | -2/+6 |
| | | |\ \ | | |_|/ / | |/| | | | |||||
| | | * | | Merge branch 'master' into i328-MultiVault | kumavis | 2016-11-11 | 3 | -2/+26 |
| | | |\ \ | |||||
| | | * \ \ | Merge pull request #802 from MetaMask/confTxFix | Kevin Serrano | 2016-11-11 | 9 | -28/+33 |
| | | |\ \ \ | |||||
| | | | * | | | fix tx data so it has the network id | Frankie | 2016-11-11 | 2 | -2/+9 |
| | | | * | | | Merge branch 'master' into i328-MultiVault | Frankie | 2016-11-11 | 8 | -26/+24 |
| | | |/| | | | |||||
| | * | | | | | Replace old random-id code with incrementing id generator | Dan Finlay | 2016-11-18 | 3 | -11/+12 |
| | |/ / / / | |||||
| | * | | | | Merge branch 'master' into i328-MultiVault | Dan Finlay | 2016-11-08 | 4 | -17/+48 |
| | |\ \ \ \ | |||||
| | * | | | | | Fix integration test suite | Dan Finlay | 2016-11-08 | 3 | -13/+5 |
| | * | | | | | Fix nickname test | Dan Finlay | 2016-11-08 | 1 | -0/+1 |
| | * | | | | | Fix BN reference | Dan Finlay | 2016-11-08 | 1 | -0/+1 |
| | * | | | | | Fix 787 gas buffer bug | Dan Finlay | 2016-11-08 | 2 | -9/+25 |
| | * | | | | | Fix network checking | Dan Finlay | 2016-11-05 | 1 | -21/+1 |
| | * | | | | | Remove insane actions hash | Dan Finlay | 2016-11-05 | 1 | -6/+2 |
| | * | | | | | Add tolerance to normalize method | Dan Finlay | 2016-11-04 | 1 | -0/+1 |
| | * | | | | | Fix password validation and persistence issue | Dan Finlay | 2016-11-04 | 3 | -4/+30 |
| | * | | | | | Implement private key exporting. | Kevin Serrano | 2016-11-04 | 2 | -3/+22 |
| | * | | | | | Finish fixing nicknaming bug | Dan Finlay | 2016-11-04 | 2 | -28/+70 |
| | * | | | | | Fix account nicknaming bug | Dan Finlay | 2016-11-04 | 3 | -3/+19 |
| | * | | | | | Fix vault creation bug | Dan Finlay | 2016-11-04 | 2 | -25/+41 |
| | * | | | | | Set test env during tests | Dan Finlay | 2016-11-04 | 1 | -1/+1 |
| | * | | | | | Don't faucet during tests | Dan Finlay | 2016-11-04 | 1 | -1/+2 |
| | * | | | | | Don't faucet in development | Dan Finlay | 2016-11-04 | 1 | -1/+3 |
| | * | | | | | Fix dual vault creation bug | Dan Finlay | 2016-11-03 | 2 | -12/+16 |
| | * | | | | | Fix initial vault creation | Dan Finlay | 2016-11-03 | 1 | -4/+8 |
| | * | | | | | Fix handling of migrating old vault style | Dan Finlay | 2016-11-03 | 5 | -56/+114 |
| | * | | | | | Add reveal of seed words. | Kevin Serrano | 2016-11-02 | 5 | -2/+52 |
| | * | | | | | Make identicon tolerant of changing state | Dan Finlay | 2016-11-02 | 1 | -0/+17 |
| | * | | | | | Fixed bugs related to clearing caches when restoring to a new vault | Dan Finlay | 2016-11-02 | 6 | -13/+54 |
| | * | | | | | Make forgot password button. | Dan Finlay | 2016-11-02 | 3 | -32/+23 |
| | * | | | | | Remove and untrack npm debug files | Dan Finlay | 2016-11-02 | 2 | -46/+1 |
| | * | | | | | Fix seed phrase restore | Dan Finlay | 2016-11-02 | 3 | -5/+4 |
| | * | | | | | Made progress on parity for MultiVault | Kevin Serrano | 2016-11-02 | 10 | -199/+103 |
| | * | | | | | Do not open MM page in dev mode. | Kevin Serrano | 2016-11-02 | 1 | -1/+2 |
| | * | | | | | Linted | Kevin Serrano | 2016-11-01 | 2 | -1/+46 |
| | * | | | | | Implement seed word confirmation page. | Kevin Serrano | 2016-11-01 | 9 | -12/+53 |
| | * | | | | | Implement auto-fauceting | Kevin Serrano | 2016-11-01 | 1 | -1/+6 |
| | * | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3... | Kevin Serrano | 2016-10-31 | 5 | -16/+142 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Now migrating old vaults to new DEN format | Dan Finlay | 2016-10-29 | 5 | -16/+142 |
| | * | | | | | | Make case condition more consistent. Remove extra action. Fix incorrect displ... | Kevin Serrano | 2016-10-31 | 2 | -2/+3 |
| | * | | | | | | Add focus to password field. | Kevin Serrano | 2016-10-31 | 1 | -0/+4 |
| | * | | | | | | Add password warning div. | Kevin Serrano | 2016-10-31 | 1 | -2/+7 |
| | * | | | | | | Modify first-screen design to match docs. | Kevin Serrano | 2016-10-31 | 1 | -2/+3 |
| | * | | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3... | Kevin Serrano | 2016-10-29 | 13 | -30/+465 |
| | |\| | | | | | |||||
| | | * | | | | | Add vault migration test | Dan Finlay | 2016-10-29 | 1 | -0/+91 |
| | | * | | | | | Configure BIP44 Keychain as default one | Dan Finlay | 2016-10-29 | 4 | -11/+44 |
| | | * | | | | | Added hd wallet tests | Dan Finlay | 2016-10-28 | 2 | -4/+109 |
| | | * | | | | | Add hd wallet keyring | Dan Finlay | 2016-10-28 | 2 | -0/+79 |
| | | * | | | | | Fix identicon rendering | Dan Finlay | 2016-10-28 | 1 | -7/+6 |
| | | * | | | | | Update first screen to match design. | Dan Finlay | 2016-10-28 | 2 | -10/+99 |
| | | * | | | | | Add latest jazzicon version | Dan Finlay | 2016-10-28 | 1 | -1/+1 |
| | | * | | | | | Add first-time state | Dan Finlay | 2016-10-28 | 2 | -1/+40 |
| | | * | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3... | Dan Finlay | 2016-10-26 | 20 | -205/+7 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch 'master' into i328-MultiVault | Dan Finlay | 2016-10-26 | 4 | -14/+35 |
| | | |\ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ | Merge branch 'master' into i328-MultiVault | Kevin Serrano | 2016-10-29 | 12 | -42/+76 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Remove debugger statement. | Kevin Serrano | 2016-10-26 | 1 | -1/+0 |
| | * | | | | | | | | Phase out extra warning screen. | Kevin Serrano | 2016-10-26 | 20 | -205/+8 |
| | * | | | | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3... | Kevin Serrano | 2016-10-24 | 15 | -87/+712 |
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | |