Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added error when trying to unlock uninitialized vault | Dan Finlay | 2016-12-22 | 1 | -0/+4 |
* | Move old keystore migration code to metamask controller | Dan Finlay | 2016-12-22 | 2 | -46/+50 |
* | Make notices confirmation configurable | Dan Finlay | 2016-12-21 | 2 | -2/+16 |
* | Merge pull request #916 from MetaMask/i894-DetectBadAccounts | Dan Finlay | 2016-12-21 | 4 | -16/+57 |
|\ | |||||
| * | Made changes according to feedback. | Dan Finlay | 2016-12-20 | 3 | -13/+12 |
| * | Got bad account detection working and added to state | Dan Finlay | 2016-12-10 | 3 | -31/+8 |
| * | Mostly added bad account detection | Dan Finlay | 2016-12-09 | 4 | -9/+74 |
* | | Remove encryptor in favor of external browser-passworder | Dan Finlay | 2016-12-20 | 2 | -157/+2 |
* | | Merge pull request #937 from MetaMask/i900-forgot-password-flow | Dan Finlay | 2016-12-20 | 2 | -4/+3 |
|\ \ | |||||
| * | | Lint. | Kevin Serrano | 2016-12-20 | 2 | -4/+3 |
| |/ | |||||
* | | Merged master into dev | Dan Finlay | 2016-12-20 | 4 | -19/+131 |
|\ \ | |/ |/| | |||||
| * | inpage - temporarily disable ping stream | kumavis | 2016-12-20 | 1 | -8/+9 |
| * | move notice code from metamask-controller + config-manager, in to notice-cont... | kumavis | 2016-12-17 | 3 | -111/+98 |
| * | Deactivate polling for now. | Kevin Serrano | 2016-12-17 | 1 | -1/+3 |
| * | Cleanup | Dan Finlay | 2016-12-17 | 1 | -3/+0 |
| * | Add ability to show notices to user & get confirmation. | Kevin Serrano | 2016-12-17 | 1 | -18/+22 |
| * | Add ability to show notices to user & get confirmation. | Kevin Serrano | 2016-12-17 | 3 | -2/+122 |
| * | Remove morden testnet provider | Dan Finlay | 2016-12-16 | 1 | -2/+1 |
| * | inpage - correctly listen for incomming messages | kumavis | 2016-12-08 | 1 | -1/+1 |
* | | Remove redundant logging block | Dan Finlay | 2016-12-02 | 1 | -3/+0 |
* | | Fix vault encrypting & unlocking bug | Dan Finlay | 2016-12-01 | 2 | -6/+15 |
* | | 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 |
* | | Flattened addTx async methods | Dan Finlay | 2016-11-30 | 1 | -89/+82 |
* | | 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 | 1 | -25/+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 |
* | | Fix nodeify usage | Dan Finlay | 2016-11-29 | 1 | -11/+11 |
* | | Fix nodeify | Dan Finlay | 2016-11-29 | 1 | -55/+13 |
* | | Denodeify most of KeyringController | Dan Finlay | 2016-11-29 | 3 | -159/+201 |
* | | Merge branch 'master' into dev | Dan Finlay | 2016-11-24 | 2 | -22/+55 |
|\| | |||||
| * | rpc - add sync uninstallFilter support | kumavis | 2016-11-24 | 1 | -0/+7 |
| * | Merge branch 'master' into i868-estimateGasTooHigh | kumavis | 2016-11-23 | 1 | -1/+1 |
| |\ | |||||
| | * | Ropsten has sole access to the faucet. | Kevin Serrano | 2016-11-23 | 1 | -1/+1 |
| | * | Add to changelog. | Kevin Serrano | 2016-11-23 | 1 | -1/+1 |
| * | | idStore - fix estimateGas calculation | kumavis | 2016-11-23 | 1 | -22/+48 |
| |/ | |||||
* | | Fix more async usage of KeyringController | Dan Finlay | 2016-11-24 | 1 | -25/+32 |
* | | Fix more keyring asyncifying tests | Dan Finlay | 2016-11-24 | 1 | -2/+3 |
* | | Mostly got async keyringController tests passing | Dan Finlay | 2016-11-23 | 1 | -7/+9 |
* | | 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 |
* | | Fix new encryptor migration logic | Dan Finlay | 2016-11-23 | 2 | -3/+2 |
* | | Fix password reference | Dan Finlay | 2016-11-23 | 1 | -1/+2 |
* | | Remove line of cruft | Dan Finlay | 2016-11-23 | 1 | -1/+0 |
* | | Refine isInitialized derivation method | Dan Finlay | 2016-11-23 | 1 | -1/+1 |
* | | Simplify Encryptor API Surface | Dan Finlay | 2016-11-23 | 2 | -45/+31 |
* | | Merge branch 'dev' into i843-MoveSaltIntoEncryptor | Dan Finlay | 2016-11-23 | 9 | -74/+157 |
|\ \ | |||||
| * \ | Merge pull request #875 from MetaMask/i868-estimateGasTooHigh-dev | Dan Finlay | 2016-11-23 | 1 | -5/+61 |
| |\ \ | |||||
| | * | | KeyringController - estimateGas->analyzeGasUsage fix gasLimit + detect OOG | kumavis | 2016-11-23 | 1 | -5/+61 |
| * | | | Merge pull request #858 from MetaMask/i842-WaitForSeedWord | kumavis | 2016-11-23 | 1 | -1/+6 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Move state update outside of conditional callback block | Dan Finlay | 2016-11-23 | 1 | -1/+1 |
| | * | | Remove callback type check | Dan Finlay | 2016-11-23 | 1 | -1/+1 |
| | * | | Merge branch 'dev' into i842-WaitForSeedWord | Dan Finlay | 2016-11-23 | 4 | -37/+57 |
| | |\ \ | |||||
| | * | | | Use callback in placeSeedWord method. | Dan Finlay | 2016-11-22 | 1 | -1/+6 |
| * | | | | 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 | 5 | -23/+27 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'dev' into dev-cleanup | Kevin Serrano | 2016-11-23 | 4 | -37/+57 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | * | | | | Change fauceting to become a response of an emit. | Kevin Serrano | 2016-11-22 | 2 | -2/+7 |
| | * | | | | change all instances of selectedAddress to selectedAccount. | Kevin Serrano | 2016-11-22 | 4 | -13/+12 |
| | * | | | | Remove entropy from encryption and project. | Kevin Serrano | 2016-11-22 | 2 | -8/+8 |
| | | |/ / | | |/| | | |||||
| * | | | | Phase out ethereumjs-util from encryptor module. | Kevin Serrano | 2016-11-23 | 1 | -6/+4 |
| | |/ / | |/| | | |||||
| * | | | Merge pull request #866 from MetaMask/new-faucet-dev | Dan Finlay | 2016-11-23 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * | | | Make ropsten faucet button point at the correct url. | Kevin Serrano | 2016-11-23 | 1 | -1/+1 |
| | |/ / | |||||
| * / / | Improve Keyring organization | Dan Finlay | 2016-11-22 | 3 | -36/+56 |
| |/ / | |||||
* / / | Began moving salt into encryptor | Dan Finlay | 2016-11-23 | 1 | -5/+10 |
|/ / | |||||
* | | Merge branch 'dev' into i831-AddRopsten-Dev | Dan Finlay | 2016-11-22 | 20 | -145/+1135 |
|\ \ | |/ |/| | |||||
| * | Maintain linting. | Kevin Serrano | 2016-11-19 | 2 | -3/+3 |
| * | Promisify persistence of keyrings before returning key | Kevin Serrano | 2016-11-19 | 1 | -5/+5 |
| * | 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 |
| * | Resolve merge conflict. | Kevin Serrano | 2016-11-19 | 20 | -142/+1132 |
| |\ | |||||
| | * | random-id - use Number.MAX_SAFE_INTEGER as max | kumavis | 2016-11-18 | 1 | -1/+1 |
| | * | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3... | Dan Finlay | 2016-11-18 | 17 | -173/+157 |
| | |\ | |||||
| | | * | Revert one cb to previous state. | Kevin Serrano | 2016-11-16 | 1 | -1/+1 |
| | | * | Minimize dispatches by using emitters and relying on state updates. | Kevin Serrano | 2016-11-16 | 1 | -7/+6 |
| | | * | Fix semantics in comments | Kevin Serrano | 2016-11-16 | 1 | -1/+1 |
| | | * | Lints. | Kevin Serrano | 2016-11-16 | 1 | -1/+1 |
| | | * | Resolve merge conflicts. | Kevin Serrano | 2016-11-16 | 2 | -5/+4 |
| | | |\ | |||||
| | | * \ | 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 | 1 | -7/+6 |
| | | |/ / | |||||
| | | * | | Re-enable disclaimer screen. Rename variables to reflect role more clearly. | Kevin Serrano | 2016-11-15 | 4 | -8/+8 |
| | | * | | 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 |
| | | * | | Linting to the max. | Kevin Serrano | 2016-11-12 | 16 | -126/+93 |
| | | * | | Merge branch 'master' into i328-MultiVault | kumavis | 2016-11-11 | 1 | -2/+16 |
| | | |\ \ | |||||
| | | * | | | 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 | 2 | -2/+3 |
| | | |\ \ \ | |||||
| | * | | | | | 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 | 1 | -5/+5 |
| | |\ \ \ \ | |||||
| | * | | | | | Fix 787 gas buffer bug | Dan Finlay | 2016-11-08 | 1 | -5/+5 |
| | * | | | | | Fix network checking | Dan Finlay | 2016-11-05 | 1 | -21/+1 |
| | * | | | | | Add tolerance to normalize method | Dan Finlay | 2016-11-04 | 1 | -0/+1 |
| | * | | | | | Fix password validation and persistence issue | Dan Finlay | 2016-11-04 | 2 | -4/+8 |
| | * | | | | | Implement private key exporting. | Kevin Serrano | 2016-11-04 | 2 | -3/+22 |
| | * | | | | | Finish fixing nicknaming bug | Dan Finlay | 2016-11-04 | 1 | -28/+39 |
| | * | | | | | Fix account nicknaming bug | Dan Finlay | 2016-11-04 | 2 | -3/+8 |
| | * | | | | | Fix vault creation bug | Dan Finlay | 2016-11-04 | 1 | -17/+13 |
| | * | | | | | 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 | 1 | -11/+4 |
| | * | | | | | Fix initial vault creation | Dan Finlay | 2016-11-03 | 1 | -4/+8 |
| | * | | | | | Fix handling of migrating old vault style | Dan Finlay | 2016-11-03 | 3 | -46/+78 |
| | * | | | | | Add reveal of seed words. | Kevin Serrano | 2016-11-02 | 2 | -2/+9 |
| | * | | | | | Fixed bugs related to clearing caches when restoring to a new vault | Dan Finlay | 2016-11-02 | 3 | -10/+48 |
| | * | | | | | Fix seed phrase restore | Dan Finlay | 2016-11-02 | 1 | -1/+1 |
| | * | | | | | Made progress on parity for MultiVault | Kevin Serrano | 2016-11-02 | 4 | -28/+60 |
| | * | | | | | Do not open MM page in dev mode. | Kevin Serrano | 2016-11-02 | 1 | -1/+2 |
| | * | | | | | Implement seed word confirmation page. | Kevin Serrano | 2016-11-01 | 4 | -10/+29 |
| | * | | | | | 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 | 3 | -6/+79 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Now migrating old vaults to new DEN format | Dan Finlay | 2016-10-29 | 3 | -6/+79 |
| | * | | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3... | Kevin Serrano | 2016-10-29 | 3 | -7/+111 |
| | |\| | | | | | |||||
| | | * | | | | | Configure BIP44 Keychain as default one | Dan Finlay | 2016-10-29 | 2 | -7/+25 |
| | | * | | | | | Added hd wallet tests | Dan Finlay | 2016-10-28 | 1 | -4/+12 |
| | | * | | | | | Add hd wallet keyring | Dan Finlay | 2016-10-28 | 1 | -0/+78 |
| | | * | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3... | Dan Finlay | 2016-10-26 | 4 | -27/+0 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch 'master' into i328-MultiVault | Dan Finlay | 2016-10-26 | 1 | -9/+14 |
| | | |\ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ | Merge branch 'master' into i328-MultiVault | Kevin Serrano | 2016-10-29 | 1 | -11/+16 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Phase out extra warning screen. | Kevin Serrano | 2016-10-26 | 4 | -27/+0 |
| | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Fix loading indication | Dan Finlay | 2016-10-22 | 1 | -1/+1 |
| | * | | | | | | | Added tx & msg managing functionality to new KeyringController | Dan Finlay | 2016-10-22 | 2 | -1/+150 |
| | * | | | | | | | Fix bug in new KeyringController vault restoring logic. | Dan Finlay | 2016-10-22 | 1 | -3/+5 |
| | * | | | | | | | Create basic keyring-controller unit test file | Dan Finlay | 2016-10-22 | 2 | -12/+16 |
| | * | | | | | | | Added SimpleKeyring tests | Dan Finlay | 2016-10-22 | 3 | -18/+27 |
| | * | | | | | | | Added tx and msg signing to keychain & controller | Dan Finlay | 2016-10-21 | 4 | -39/+134 |
| | * | | | | | | | Improved simple account generation | Dan Finlay | 2016-10-21 | 2 | -34/+51 |
| | * | | | | | | | Began adding first basic keyring | Dan Finlay | 2016-10-21 | 4 | -9/+146 |
| | * | | | | | | | Merge branch 'master' into i328-MultiVault | Dan Finlay | 2016-10-21 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix tests | Dan Finlay | 2016-10-21 | 2 | -7/+9 |
| | * | | | | | | | | Linted & added salting to vault | Dan Finlay | 2016-10-21 | 3 | -35/+26 |
| | * | | | | | | | | Fix state updating after vault creation and unlocking | Dan Finlay | 2016-10-21 | 1 | -2/+2 |
| | * | | | | | | | | Fix unlock logic | Dan Finlay | 2016-10-21 | 1 | -6/+17 |
| | * | | | | | | | | Git merge resolution. | Kevin Serrano | 2016-10-20 | 6 | -4/+56 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Intermediary commit. | Kevin Serrano | 2016-10-20 | 2 | -4/+44 |
| | * | | | | | | | | | Remove unused crypto dependencies. | Kevin Serrano | 2016-10-20 | 1 | -2/+0 |
| | * | | | | | | | | | Merge in crypto. | Kevin Serrano | 2016-10-20 | 1 | -0/+119 |
| | * | | | | | | | | | Initial work on UI side | Kevin Serrano | 2016-10-16 | 2 | -0/+26 |
| | * | | | | | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into or... | Kevin Serrano | 2016-10-13 | 2 | -13/+133 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Add minimal method signatures to new keyring controller | Dan Finlay | 2016-10-13 | 2 | -14/+92 |
| | | * | | | | | | | | | Merge branch 'master' into i328-MultiVault | Dan Finlay | 2016-10-13 | 4 | -2/+52 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Add initial KeyringController files | Dan Finlay | 2016-10-12 | 1 | -0/+42 |
* | | | | | | | | | | | | | Begin adding Ropsten support | Dan Finlay | 2016-11-22 | 2 | -1/+7 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | / | Increment tx ids to avoid collisions | Dan Finlay | 2016-11-18 | 3 | -11/+11 |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||||
* | | | | | | | | | | | First attempt at fixing errors in confirmation screen. | Kevin Serrano | 2016-11-15 | 2 | -4/+3 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
* | | | | | | | | | | detect tx error - show warning and fix gasLimit | kumavis | 2016-11-11 | 1 | -2/+16 |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
* | | | | | | | | | remove gas field, due to alias redundancy. | Kevin Serrano | 2016-11-10 | 1 | -1/+0 |
* | | | | | | | | | Fix bug for increasing gas by 20 percent. | Kevin Serrano | 2016-11-10 | 2 | -1/+2 |
* | | | | | | | | | Adjust gas buffer to be 20% over estimate | Dan Finlay | 2016-11-09 | 1 | -1/+2 |
* | | | | | | | | | Increase gas buffer | Dan Finlay | 2016-11-09 | 1 | -1/+1 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | Fix gas price buffering | Dan Finlay | 2016-11-08 | 1 | -5/+5 |
| |_|_|_|_|/ / |/| | | | | | | |||||
* | | | | | | | Merge branch 'master' into i762-RenameWalletToAccount | Dan Finlay | 2016-10-27 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix delegate call function reference 2 | Dan Finlay | 2016-10-26 | 1 | -1/+1 |
| * | | | | | | | Fix delegate call analysis | Dan Finlay | 2016-10-26 | 1 | -1/+1 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* / | | | | | | Rename wallet to account | Dan Finlay | 2016-10-26 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'master' into i743-FixDelegateCallFlag | kumavis | 2016-10-25 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Add note about callback param to sync method warning | Dan Finlay | 2016-10-20 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'master' into i743-FixDelegateCallFlag | Kevin Serrano | 2016-10-19 | 1 | -1/+1 |
|\| | | | | |||||
| * | | | | Wait for first metamask data to establish ping-pong stream. | Dan Finlay | 2016-10-19 | 1 | -1/+1 |
* | | | | | Reproduced issue 743 in test case | Dan Finlay | 2016-10-18 | 1 | -9/+14 |
|/ / / / | |||||
* | | | | Restore hex prefix to gas price | Dan Finlay | 2016-10-18 | 1 | -1/+1 |
* | | | | Increase gas estimate by 100000 wei | Dan Finlay | 2016-10-18 | 1 | -1/+9 |
* | | | | Merge branch 'master' into i735-xmlfix | Kevin Serrano | 2016-10-18 | 4 | -0/+33 |
|\ \ \ \ | |||||
| * | | | | Fix for linting | Frankie | 2016-10-14 | 1 | -1/+1 |
| * | | | | Create callback and Clean-up details | Frankie | 2016-10-14 | 1 | -2/+7 |
| * | | | | Specify base 10 in bignumber | Frankie | 2016-10-14 | 1 | -1/+1 |
| * | | | | Merge branch 'master' into i#495CustomGasField | Frankie | 2016-10-14 | 7 | -37/+58 |
| |\| | | | |||||
| * | | | | Fix gasPrice range | Frankie | 2016-10-14 | 4 | -4/+25 |
| * | | | | Merge branch 'master' into i#495CustomGasField | Frankie | 2016-10-12 | 4 | -2/+52 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Merge branch 'master' into i#495CustomGasField | Frankie | 2016-10-11 | 4 | -24/+12 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Add custom gas field to send page | Frankie | 2016-10-11 | 1 | -0/+7 |
* | | | | | Lint. | Kevin Serrano | 2016-10-16 | 1 | -1/+1 |
* | | | | | Prevent XML from web3 injections. | Kevin Serrano | 2016-10-16 | 1 | -2/+14 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch 'master' into i695-dapp-reload | kumavis | 2016-10-13 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Remove logs. | Kevin Serrano | 2016-10-13 | 1 | -2/+0 |
| * | | | | Fix misnamed variable. | Kevin Serrano | 2016-10-13 | 1 | -2/+4 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'master' into i695-dapp-reload | kumavis | 2016-10-13 | 4 | -2/+52 |
|\| | | | |||||
| * | | | Merge branch 'tos' of github.com:MetaMask/metamask-plugin into tos | Kevin Serrano | 2016-10-12 | 1 | -0/+2 |
| |\ \ \ | |||||
| | * | | | Fix bug where new vaults had no nicknames | Dan Finlay | 2016-10-12 | 1 | -0/+2 |
| * | | | | Cleanup. | Kevin Serrano | 2016-10-12 | 1 | -2/+0 |
| |/ / / | |||||
| * | | | lint | Kevin Serrano | 2016-10-12 | 1 | -2/+1 |
| * | | | Move tos hash comparison logic from background to mm controller. | Kevin Serrano | 2016-10-12 | 2 | -27/+16 |
| * | | | Move tos hash logic to build phase. Create dynamic global variables based on ... | Kevin Serrano | 2016-10-12 | 1 | -1/+2 |
| * | | | Fix linting and guarantees set TOS hash. | Kevin Serrano | 2016-10-07 | 1 | -0/+1 |
| * | | | Fix retention of terms of service hash across reloads of plugin. | Kevin Serrano | 2016-10-07 | 1 | -1/+1 |
| * | | | Renamed variables to make more sense. | Kevin Serrano | 2016-10-07 | 1 | -2/+2 |
| * | | | Add missing path require statement. | Kevin Serrano | 2016-10-07 | 1 | -0/+1 |
| * | | | On update, check whether the TOS has changed using hashes. | Kevin Serrano | 2016-10-06 | 1 | -1/+16 |
| * | | | Add controller functions for storing and checking TOS hashes. | Kevin Serrano | 2016-10-06 | 1 | -1/+34 |
| * | | | Add new functions for storing TOS hashes in config manager. | Kevin Serrano | 2016-10-06 | 1 | -0/+11 |
| | |/ | |/| | |||||
* / | | dapp reload - fixed disconnect detection via polling | kumavis | 2016-10-13 | 6 | -35/+56 |
|/ / | |||||
* | | Add tolerance for sending from mixed-case addresses. | Dan Finlay | 2016-10-06 | 1 | -2/+2 |
* | | Correct async link | Dan Finlay | 2016-10-06 | 1 | -4/+4 |
* | | Make popup a little taller | Dan Finlay | 2016-10-05 | 1 | -1/+1 |
* | | Improve popup behavior for parity errors | Dan Finlay | 2016-10-04 | 1 | -17/+5 |
|/ | |||||
* | Fix for readability | Frankie | 2016-10-02 | 1 | -1/+1 |
* | Fix issue #688 where fiat conversion does not persist when switching networks | Frankie | 2016-10-01 | 1 | -1/+2 |
* | Drop origin key from requests for Parity compatibility | Dan Finlay | 2016-09-19 | 1 | -0/+5 |
* | Merge branch 'master' into i#519buyButtonTxConf | Frankie | 2016-09-16 | 1 | -16/+9 |
|\ | |||||
| * | Remove unused argument | Frankie | 2016-09-15 | 1 | -1/+1 |
| * | Fix popup flag assignment | Dan Finlay | 2016-09-15 | 1 | -2/+1 |
| * | Dont generate a popup notification when submiting a transaction from with in ... | Frankie | 2016-09-15 | 1 | -17/+11 |
* | | Change Testfaucet url | Frankie | 2016-09-16 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #655 from MetaMask/FixPortStreamEnd | kumavis | 2016-09-14 | 2 | -5/+10 |
|\ | |||||
| * | Fix port stream end bug | Dan Finlay | 2016-09-14 | 1 | -2/+1 |
|/ | |||||
* | Merge branch 'library' of github.com:MetaMask/metamask-plugin into library | kumavis | 2016-09-13 | 2 | -61/+90 |
|\ | |||||
| * | Fix cache clearing reference for Opera | Dan Finlay | 2016-09-13 | 1 | -1/+1 |
| * | Make cache clearning error tolerant | Dan Finlay | 2016-09-13 | 1 | -1/+6 |
| * | Fix clearing of account cache on vault restore | Dan Finlay | 2016-09-13 | 1 | -3/+7 |
| * | Linted | Dan Finlay | 2016-09-13 | 1 | -2/+2 |
| * | Load accounts into ethStore on unlock | Dan Finlay | 2016-09-13 | 1 | -0/+1 |
| * | Add accounts back to metamask state | Dan Finlay | 2016-09-13 | 1 | -1/+5 |
| * | Fix keystore reference | Dan Finlay | 2016-09-13 | 1 | -0/+1 |
| * | Fix some references | Dan Finlay | 2016-09-13 | 1 | -2/+2 |
| * | Fix account unlocking | Dan Finlay | 2016-09-13 | 2 | -10/+21 |
* | | mascara - everything but the popup bundle | kumavis | 2016-09-13 | 1 | -1/+1 |
* | | popup - breakout popup-core | kumavis | 2016-09-13 | 2 | -61/+71 |
* | | popup - further clean and comment | kumavis | 2016-09-13 | 1 | -17/+13 |
* | | ui - remove unused currentDomain prop | kumavis | 2016-09-13 | 1 | -17/+2 |
* | | Revert "Add new eth-lightwallet salting to vault." | Frankie | 2016-09-13 | 1 | -64/+61 |
|/ | |||||
* | Select first address when restoring vault | Dan Finlay | 2016-09-12 | 1 | -2/+10 |
* | Fix ethStore pushed addresses | Dan Finlay | 2016-09-12 | 1 | -1/+1 |
* | Fixed caching bug | Dan Finlay | 2016-09-11 | 1 | -6/+1 |
* | Correctly clear ethStore cache on new vault restore | Dan Finlay | 2016-09-11 | 1 | -7/+16 |
* | Captured #640 in failing test | Dan Finlay | 2016-09-11 | 1 | -0/+5 |
* | Add new eth-lightwallet salting to vault. | Dan Finlay | 2016-09-10 | 1 | -57/+43 |
* | Do not trigger how-to-video on anything but install. | Kevin Serrano | 2016-09-10 | 1 | -2/+4 |
* | Only init one wallet on restore | Dan Finlay | 2016-09-09 | 1 | -1/+1 |
* | Reverting memory leak fix | Dan Finlay | 2016-09-07 | 1 | -1/+0 |
* | Bump changelog | Dan Finlay | 2016-09-07 | 1 | -25/+0 |
* | Ensure listener is cleaned up | Dan Finlay | 2016-09-07 | 3 | -1/+27 |
* | Merge branch 'master' into first-time | Kevin Serrano | 2016-09-07 | 1 | -0/+10 |
|\ | |||||
| * | Add negative value validation to tx approval | Dan Finlay | 2016-09-07 | 1 | -0/+10 |
* | | Replace chrome with generalized browser API. | Kevin Serrano | 2016-09-07 | 1 | -2/+2 |
* | | Redirect to video in a new tab on fresh install. | Kevin Serrano | 2016-09-07 | 1 | -1/+6 |
|/ | |||||
* | linting | Vincent Serpoul | 2016-09-06 | 1 | -1/+1 |
* | Error message more helpful | Vincent Serpoul | 2016-09-06 | 1 | -2/+3 |
* | notif - use standard err-first callback style | kumavis | 2016-09-03 | 1 | -18/+24 |
* | Merge branch 'master' into i566-NoPopupWhenOpen | Dan Finlay | 2016-09-02 | 1 | -4/+18 |
|\ | |||||
| * | inpage - remap ids on response | kumavis | 2016-09-01 | 1 | -4/+18 |
* | | Linted | Dan Finlay | 2016-09-02 | 1 | -1/+1 |
* | | Do not open popup for internally produced txs | Dan Finlay | 2016-09-02 | 1 | -11/+19 |
|/ | |||||
* | Add metamask route to infura urls | Dan Finlay | 2016-09-01 | 1 | -2/+2 |
* | Remove old notification cleanup code | Dan Finlay | 2016-08-30 | 1 | -10/+0 |
* | Make popup a type Edge supports | Dan Finlay | 2016-08-30 | 1 | -1/+2 |
* | Add extra edge compatibility | Dan Finlay | 2016-08-30 | 1 | -2/+13 |