Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into i328-MultiVault | Dan Finlay | 2016-10-26 | 1 | -9/+14 |
|\ | |||||
| * | Merge branch 'master' into i743-FixDelegateCallFlag | kumavis | 2016-10-25 | 1 | -1/+1 |
| |\ | |||||
| * \ | Merge branch 'master' into i743-FixDelegateCallFlag | Kevin Serrano | 2016-10-19 | 2 | -2/+2 |
| |\ \ | |||||
| * | | | Reproduced issue 743 in test case | Dan Finlay | 2016-10-18 | 1 | -9/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | This contract hex does include the value `f4`, but it was compiled from a contract with no instance of `.delegatecall`. I believe `f4` in this case is part of some other value or contract address, and `ethBinToOps` has some error in how it skips pushed data. @kumavis | ||||
* | | | | 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 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Add note about callback param to sync method warning | Dan Finlay | 2016-10-20 | 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 | 7 | -5/+57 |
|\| | | |||||
| * | | Version 2.13.5v2.13.5 | Dan Finlay | 2016-10-19 | 1 | -1/+1 |
| | | | |||||
| * | | Wait for first metamask data to establish ping-pong stream. | Dan Finlay | 2016-10-19 | 1 | -1/+1 |
| |/ | | | | | | | | | | | Prevents infinite reload loops when dapps take too long to load. Fixes #746. | ||||
| * | 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 |
| | | | | | | | | | | | | To prevent minor gas estimation errors, probably usually related to operating on dynamic state. Fixes #738. | ||||
| * | Version 2.13.4 | Dan Finlay | 2016-10-18 | 1 | -1/+1 |
| | | |||||
| * | 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 | 7 | -27/+16 |
| | |\ \ \ | |||||
| | * | | | | 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 |
| | |_|_|/ | |/| | | | |||||
* | | | | | 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 ↵ | Kevin Serrano | 2016-10-13 | 2 | -13/+133 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | origin/i328-MultiVault | ||||
| * | | | | 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 |
| | |_|/ | |/| | | |||||
* | | | | 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 |
| | | | | | | | | | | | | | | | | build. | ||||
| * | | | 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 |
| | | | | | | | | | | | | We had to convert to lower case, and also had to modify the new provider-engine sanitizer to tolerate mixed case addresses. Fixes #707 | ||||
* | | Correct async link | Dan Finlay | 2016-10-06 | 1 | -4/+4 |
| | | |||||
* | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into Version-2.13.3 | kumavis | 2016-10-05 | 4 | -3/+4 |
|\ \ | |||||
| * \ | Merge branch 'master' into SmallerCopiedButton | kumavis | 2016-10-05 | 3 | -2/+3 |
| |\ \ | |||||
| | * | | Add Opera compatibility | Dan Finlay | 2016-10-05 | 3 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | - Fix incorrect OS key - Add additional icon image sizes. | ||||
| * | | | Make popup a little taller | Dan Finlay | 2016-10-05 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | | | | | | For some reason the popup was often cutting off the bottom buttons of the UI. We should look at that more carefully later perhaps, but especially since we're considering moving off the popup, I'm just fixing it by making it taller for now. | ||||
* / / | Version 2.13.3 | Dan Finlay | 2016-10-05 | 1 | -1/+1 |
|/ / | | | | | | | Bumps provider-engine to fix log query filtering bug. | ||||
* | | Version 2.13.2 | Dan Finlay | 2016-10-05 | 1 | -1/+1 |
| | | |||||
* | | Improve popup behavior for parity errors | Dan Finlay | 2016-10-04 | 1 | -17/+5 |
|/ | | | | When we receive an invalid params error, instead of opening the popup and showing no tx, we now just forward that tx back to the UI code. | ||||
* | 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 |
| | |||||
* | Version 2.13.12.13.1 | Dan Finlay | 2016-09-23 | 1 | -1/+1 |
| | |||||
* | Version 2.13.0 | Dan Finlay | 2016-09-19 | 1 | -1/+1 |
| | |||||
* | 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 | 2 | -17/+10 |
|\ | |||||
| * | Version 2.12.12.12.1 | Dan Finlay | 2016-09-15 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' into i#626 | Frankie | 2016-09-15 | 1 | -1/+1 |
| |\ | |||||
| | * | Version 2.12.02.12.0 | Dan Finlay | 2016-09-15 | 1 | -1/+1 |
| | | | |||||
| | * | Version 2.11.2 | Dan Finlay | 2016-09-15 | 1 | -1/+1 |
| | | | |||||
| * | | 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 |
| |/ | | | | | | | MetaMask | ||||
* / | 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 | ||||
| * | Fix port stream end bug | Dan Finlay | 2016-09-14 | 1 | -2/+1 |
|/ | | | | | | | | Emitting `end` or `close` was not ending the stream. Pushing a null packet also closes a stream, so I did that instead. Fixes #616 | ||||
* | Merge branch 'library' of github.com:MetaMask/metamask-plugin into library | kumavis | 2016-09-13 | 3 | -62/+91 |
|\ | |||||
| * | Fix cache clearing reference for Opera | Dan Finlay | 2016-09-13 | 2 | -2/+2 |
| | | | | | | | | For some reason Chrome didn't mind this awful bug, but Opera caught it. | ||||
| * | Version 2.11.0 | 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 |
| | | | | | | | | | | | | | | | | SubmitPassword was not creating a new id-management This is because I broke up the old "createIdmgmt" method to not perform as much conditional logic. Now the pieces are reusable and do what they should do. | ||||
* | | 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 |
| | | | | Fixes #642 | ||||
* | Fix ethStore pushed addresses | Dan Finlay | 2016-09-12 | 1 | -1/+1 |
| | | | | Needed to add hex prefix always. | ||||
* | Fixed caching bug | Dan Finlay | 2016-09-11 | 1 | -6/+1 |
| | | | | | | Fixed bug where the second new vault created in an IdStore would initially return the accounts from the original store. Also fixed some tests that were incorrect. | ||||
* | 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 |
| | | | | | | | | | | eth-lightwallet was previously not salting vault passwords, potentially making it easier to crack them once obtained. This branch incorporates the API changes to allow us to take advantage of the new salting logic. This is still throwing deprecation warnings, but that's actually a bug in eth-lightwallet I wrote, [I've submitted a PR for that here](https://github.com/ConsenSys/eth-lightwallet/pull/116). Fixes #555 | ||||
* | 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 |
| | | | | Fixes #610 | ||||
* | Reverting memory leak fix | Dan Finlay | 2016-09-07 | 1 | -1/+0 |
| | | | | | | This wasn't a good enough fix, and had other repercussions. Looking for a way to properly detect EOS, and tear down the correct stream accordingly. | ||||
* | Bump changelog | Dan Finlay | 2016-09-07 | 1 | -25/+0 |
| | |||||
* | Ensure listener is cleaned up | Dan Finlay | 2016-09-07 | 3 | -1/+27 |
| | | | | Also fixed bug when validating a tx with no value. | ||||
* | 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 |
| | |||||
* | Version 2.10.2 | kumavis | 2016-09-03 | 1 | -1/+1 |
| | |||||
* | notif - use standard err-first callback style | kumavis | 2016-09-03 | 1 | -18/+24 |
| | |||||
* | Version 2.10.1 | kumavis | 2016-09-03 | 1 | -1/+1 |
| | |||||
* | 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 |
| | | | | | | Fixes #597 Allows metamask-specific RPC metrics. | ||||
* | 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 |
| | |||||
* | Fix console.error references | Dan Finlay | 2016-08-30 | 1 | -3/+3 |
| | | | | Microsoft edge does not support console.error.bind, nor is that call necessary here. | ||||
* | Remove bind calls from console errors | Dan Finlay | 2016-08-30 | 1 | -4/+4 |
| | |||||
* | Merge branch 'master' into EdgeCompatibility | Dan Finlay | 2016-08-30 | 22 | -324/+329 |
|\ | |||||
| * | Version 2.10.0 | Dan Finlay | 2016-08-30 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' into i#563forgotPassword | Frankie | 2016-08-26 | 7 | -180/+94 |
| |\ | |||||
| | * | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-26 | 1 | -5/+5 |
| | |\ | |||||
| | * \ | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-25 | 3 | -3/+4 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-25 | 1 | -0/+10 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-24 | 1 | -0/+0 |
| | |\ \ \ \ | |||||
| | * | | | | | Close notification on opening main UI | Dan Finlay | 2016-08-24 | 2 | -2/+16 |
| | | | | | | | |||||
| | * | | | | | Skip popup dismissal in tests | Dan Finlay | 2016-08-24 | 1 | -0/+6 |
| | | | | | | | |||||
| | * | | | | | Linted | Dan Finlay | 2016-08-24 | 1 | -1/+0 |
| | | | | | | | |||||
| | * | | | | | Close popup even if last tx is dismissed from main UI | Dan Finlay | 2016-08-24 | 1 | -8/+14 |
| | | | | | | | |||||
| | * | | | | | Emit updates to all listeners on pending tx updates | Dan Finlay | 2016-08-24 | 3 | -53/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the metamask controller only supported a single UI event listener, which wasn't useful for having a separate notification UI open at the same time. Also reduced the notification's complexity down to a single method, which is heavily re-used. Still has an outstanding bug where if the plugin ui dismisses the last tx, it does not close the notification popup. | ||||
| | * | | | | | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-23 | 3 | -3/+35 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-23 | 3 | -0/+30 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Limit to one popup, re-focus on additional notifications. | Dan Finlay | 2016-08-23 | 1 | -6/+17 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-23 | 4 | -1/+42 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Linted | Dan Finlay | 2016-08-17 | 1 | -15/+5 |
| | | | | | | | | | | |||||
| | * | | | | | | | | MVP Popup Notifications Working | Dan Finlay | 2016-08-17 | 3 | -87/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm unsure which will be more performant: A notification using a trimmed down version of the UI, or using them both, letting the browser cache them both. In any case, here I've modified the normal UI to recognize when it's a popup, and change the UX accordingly in a few ways: - Hide the menu bar - Hide the back button from the notifications view. - When confirming the last tx, close the window. | ||||
| | * | | | | | | | | Unify notification and popup ui files | Dan Finlay | 2016-08-17 | 5 | -3/+27 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'master' into PopupNotifications | Dan Finlay | 2016-08-17 | 4 | -0/+82 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Set up MVP for popup-based notifications. | Dan Finlay | 2016-08-17 | 4 | -128/+106 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into i#563forgotPassword | Frankie | 2016-08-26 | 9 | -6/+79 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Bump versioning. | Kevin Serrano | 2016-08-25 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'master' into shortcut-fix | Kevin Serrano | 2016-08-25 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | |||||
| | | * | | | | | | | | Version 2.9.1 | Dan Finlay | 2016-08-25 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Fixed prohibited shortcut combination. | Kevin Serrano | 2016-08-25 | 1 | -4/+4 |
| | |/ / / / / / / / | |||||
| | * | | | | | | | | Merge branch 'master' into i484PersistPendingSignatures | Dan Finlay | 2016-08-25 | 2 | -2/+12 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Implement usage of nock. | Kevin Serrano | 2016-08-25 | 1 | -22/+12 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Added mock option to function. | Kevin Serrano | 2016-08-25 | 1 | -13/+23 |
| | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||||
| | | * | | | | | | | Change shortcut again to Ctrl+Alt+M | Kevin Serrano | 2016-08-25 | 1 | -4/+4 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Change shortcut to Alt+M | Kevin Serrano | 2016-08-25 | 1 | -4/+4 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Add shortcut for opening MetaMask. | Kevin Serrano | 2016-08-24 | 1 | -0/+10 |
| | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | * | | | | | | | Linted | Dan Finlay | 2016-08-25 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix bug where unconfirmed message sig is lost when locked. | Dan Finlay | 2016-08-25 | 1 | -0/+1 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #484 Adds unsigned messages to the in-memory message list before showing the unlock message. | ||||
| | * | | | | | | Merge branch 'master' into fox-sub | Kevin Serrano | 2016-08-24 | 6 | -3/+65 |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | |||||
| | | * | | | | | Merge branch 'master' into kumavis-patch-1 | kumavis | 2016-08-23 | 1 | -0/+6 |
| | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ | Merge branch 'master' into i390-TransactionLimit | kumavis | 2016-08-23 | 4 | -2/+58 |
| | | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge branch 'master' into i390-TransactionLimit | Dan Finlay | 2016-08-23 | 4 | -1/+42 |
| | | | |\ \ \ \ \ \ | | | | | | |_|_|/ / | | | | | |/| | | | | |||||
| | | | * | | | | | | Enforce tx history limit | Dan Finlay | 2016-08-19 | 1 | -0/+6 |
| | | | | |_|_|/ / | | | | |/| | | | | |||||
| | | * | | | | | | inpage - cleanContextForImports fix | kumavis | 2016-08-23 | 1 | -1/+1 |
| | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | set to undefined instead of deleting updates #447 | ||||
| | | * | | | | | Merge branch 'master' into i479 | kumavis | 2016-08-23 | 3 | -0/+30 |
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | |||||
| | | | * | | | | First part of chinese translation. | Kevin Serrano | 2016-08-23 | 1 | -0/+10 |
| | | | | | | | | |||||
| | | | * | | | | Add spanish locales. | Kevin Serrano | 2016-08-23 | 2 | -0/+20 |
| | | | | |/ / | | | | |/| | | |||||
| | | * / | | | inpage provider - reassign incomming ids | kumavis | 2016-08-23 | 1 | -2/+28 |
| | | |/ / / | |||||
| | * / / / | Created option to pass in static file for fallback for logo. | Kevin Serrano | 2016-08-24 | 1 | -0/+0 |
| | |/ / / | |||||
| * / / / | Add a back button on lock screen to go back to init menu | Frankie | 2016-08-26 | 1 | -0/+5 |
| |/ / / | |||||
| * | | | Version 2.9.0 | Dan Finlay | 2016-08-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | Create a ShapeShift tx in tx History | Frankie | 2016-08-19 | 2 | -7/+8 |
| | | | | |||||
| * | | | Merge branch 'master' into shapeshiftTx | Frankie | 2016-08-19 | 5 | -1/+83 |
| |\| | | |||||
| | * | | Added compliance for tests and properly accounts for N/A conversions. | Kevin Serrano | 2016-08-17 | 1 | -3/+3 |
| | | | | |||||
| | * | | Fix uncalled fn. | Kevin Serrano | 2016-08-17 | 1 | -1/+1 |
| | | | | |||||
| | * | | Add fallback to API failure. | Kevin Serrano | 2016-08-17 | 1 | -0/+2 |
| | | | | |||||
| | * | | Remove logging. Clean up duplicate entries in currency list. | Kevin Serrano | 2016-08-17 | 1 | -1/+0 |
| | | | | |||||
| | * | | Merge branch 'master' into usd-conversion | Kevin Serrano | 2016-08-17 | 1 | -1/+1 |
| | |\| | |||||
| | | * | Version 2.8.0 | Dan Finlay | 2016-08-16 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge master. | Kevin Serrano | 2016-08-16 | 11 | -140/+30 |
| | |\| | |||||
| | * | | Did not previously call functions before! | Kevin Serrano | 2016-08-10 | 1 | -3/+3 |
| | | | | |||||
| | * | | Fix default value. Add loading indication for async. | Kevin Serrano | 2016-08-10 | 1 | -1/+1 |
| | | | | |||||
| | * | | Enable full listing of supported currencies by Cryptonator. | Kevin Serrano | 2016-08-10 | 1 | -0/+1 |
| | | | | |||||
| | * | | Get fiat numbers rendering on tooltip. Need to find way to create line breaks. | Kevin Serrano | 2016-08-06 | 1 | -6/+0 |
| | | | | |||||
| | * | | Merge branch 'master' into usd-conversion | Kevin Serrano | 2016-08-05 | 7 | -18/+59 |
| | |\ \ | |||||
| | * \ \ | Fix merge conflicts. Fix typos. Ensure currency immediately updated on load. | Kevin Serrano | 2016-07-23 | 4 | -10/+52 |
| | |\ \ \ | |||||
| | * | | | | Linting! | Kevin Serrano | 2016-07-23 | 2 | -3/+5 |
| | | | | | | |||||
| | * | | | | Change function names. Add interval polling for api. Refactor functions. | Kevin Serrano | 2016-07-22 | 2 | -8/+31 |
| | | | | | | |||||
| | * | | | | Add date access throughout the data flow. | Kevin Serrano | 2016-07-22 | 3 | -4/+6 |
| | | | | | | |||||
| | * | | | | Provide date access. | Kevin Serrano | 2016-07-22 | 1 | -1/+8 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into usd-conversion | Kevin Serrano | 2016-07-22 | 11 | -34/+113 |
| | |\ \ \ \ | |||||
| | * | | | | | Add data field to pass up parameters up to reducer. | Kevin Serrano | 2016-07-22 | 2 | -2/+9 |
| | | | | | | | |||||
| | * | | | | | Add fiat actions to metamask controllere and actions. | Kevin Serrano | 2016-07-22 | 1 | -0/+10 |
| | | | | | | | |||||
| | * | | | | | Progress on config manager. Plus tests. | Kevin Serrano | 2016-07-21 | 1 | -0/+27 |
| | | | | | | | |||||
| * | | | | | | WIP: ShapeShift tx | Frankie | 2016-08-19 | 3 | -0/+40 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Remove ethereum classic provider | Dan Finlay | 2016-08-15 | 2 | -7/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #542 | ||||
| * | | | | | deps - extracted ensnare to module | kumavis | 2016-08-13 | 2 | -25/+1 |
| | | | | | | |||||
| * | | | | | Add global var for background. | Kevin Serrano | 2016-08-12 | 4 | -5/+15 |
| | | | | | | |||||
| * | | | | | Merge github.com:MetaMask/metamask-plugin into logging-fix | Kevin Serrano | 2016-08-12 | 4 | -100/+7 |
| |\ \ \ \ \ | |||||
| | * | | | | | inpage-prov - sync error - fix link | kumavis | 2016-08-12 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | deps - local-message-stream extracted as module post-message-stream | kumavis | 2016-08-12 | 3 | -58/+2 |
| | | | | | | | |||||
| | * | | | | | clean -formatting | kumavis | 2016-08-12 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | inpage-provider - remove createSyncProvider, just fail | kumavis | 2016-08-12 | 1 | -40/+3 |
| | | | | | | | |||||
| * | | | | | | Create global variable that changes ui logging. | Kevin Serrano | 2016-08-12 | 2 | -9/+2 |
| | | | | | | | |||||
| * | | | | | | Setting defaults to production. | Kevin Serrano | 2016-08-12 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Separate developmentMode conditional to only wrap log. | Kevin Serrano | 2016-08-12 | 1 | -2/+4 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into logging-fix | Kevin Serrano | 2016-08-12 | 2 | -3/+7 |
| |\| | | | | | |||||
| | * | | | | | Fix ether warning checkbox. | Kevin Serrano | 2016-08-11 | 2 | -3/+7 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Lint | Kevin Serrano | 2016-08-12 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Add ability to hide logging messages in production. | Kevin Serrano | 2016-08-12 | 2 | -3/+7 |
| |/ / / / | |||||
* / / / / | Add MSFT Edge keys to manifest.json | Dan Finlay | 2016-08-08 | 1 | -1/+3 |
|/ / / / | |||||
* | | | | Version 2.7.3 | Dan Finlay | 2016-07-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix account selection updating | Dan Finlay | 2016-07-30 | 1 | -0/+1 |
| | | | | |||||
* | | | | Version 2.7.2 | Dan Finlay | 2016-07-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into AddEthClassic | Dan Finlay | 2016-07-29 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fix broken reference to host store.didUpdate | Dan Finlay | 2016-07-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | I'd returned this line because it seemed to fix Firefox compatibility, now it seems like that wasn't the case. Removing it again. | ||||
* | | | | | Add eth classic to provider menu | Dan Finlay | 2016-07-29 | 3 | -1/+6 |
|/ / / / | |||||
* | | | | Version 2.7.1 | Dan Finlay | 2016-07-28 | 1 | -1/+1 |
| | | | | |||||
* | | | | Enhance manifest details | Dan Finlay | 2016-07-27 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'origin/Version2.7.0' into FixChromeBuild | Dan Finlay | 2016-07-27 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Version 2.7.02.7.0 | Dan Finlay | 2016-07-22 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Add platform specific builds and zip tasks (#486) | Dan Finlay | 2016-07-27 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add platform specific folders to dist folder * Remove gulp hacks * Add platform specific bundling dev and dist tasks now build into platform-specific folders within the `dist` folder. Added tasks `gulp zip` and `gulp dist`. `zip` builds the platform-specific folders into platform-specific bundles within the `dist` folder. `dist` builds and then zips all at once. * Fix chrome bundle zipping * Fix broken reference in eth warning * Fix but where web3.eth.accounts are not available in firefox. * Bump changelog | ||||
* | | | | | Fix integration tests | Dan Finlay | 2016-07-26 | 1 | -4/+19 |
| | | | | | |||||
* | | | | | Fix extension tests | Dan Finlay | 2016-07-26 | 2 | -2/+5 |
| | | | | | |||||
* | | | | | Inject inpage script synchronously | Dan Finlay | 2016-07-26 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Huge thanks to the Firefox team, for their help on the issue of our long-standing inpage script race condition. http://stackoverflow.com/questions/38577656/how-can-i-make-a-firefox-add-on-contentscript-inject-and-run-a-script-before-oth The problem is that we were injecting a `script` tag and assigning its `src` attribute, which triggers an asynchronous fetch request, and does not guarantee execution order! (That was news to me!) Instead, I'm now assigning the `script` tag a `textContent` value of the script to inject, and it seems to fix the problem! There is also a Firefox-only API that could solve this whole problem in an even more elegant way, so we might want to expose a code path for that solution later on: https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XPCOM/Language_Bindings/Components.utils.exportFunction Allows you to expose an object from one scope to another. There was even talk of creating a polyfill for it that does virtually what we do, message passing between contexts. | ||||
* | | | | | Clean up extension polyfill abstraction | Dan Finlay | 2016-07-26 | 2 | -14/+14 |
| | | | | | |||||
* | | | | | Allow page injection to look for cross-browser APIs appropriately | Dan Finlay | 2016-07-26 | 1 | -1/+2 |
| |_|_|/ |/| | | | |||||
* | | | | Manifest fix for firefox-specific field (#475) | Kevin Serrano | 2016-07-22 | 1 | -5/+0 |
|/ / / | | | | | | | | | | | | | | | | * Remove firefox-only manifest.json line. * Changelog change. | ||||
* | / | Buy button (#474) | Frankie | 2016-07-22 | 3 | -1/+40 |
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * WIP: Buy button link * Add buy eth and the buy eth warning message * Add css * Move the opening of coinbase page to background and send to faucet if on test net * Create a Warning about storeing eth * Finish Buy button and Eth store warning screen * Add to CHANGELOG * fix frankies deletion and change chrome to extension | ||||
* | | Implement some cross-browser practices (#473) | Dan Finlay | 2016-07-22 | 9 | -30/+93 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Add mozilla plugin key to manifest * Move all chrome references into platform-checking module Addresses #453 * Add chrome global back to linter blacklist * Add tests | ||||
* | | Make injected web3 fail hard on sync methods (#471) | Dan Finlay | 2016-07-21 | 1 | -1/+9 |
| | | | | | | Make injected web3 fail hard on sync methods | ||||
* | | Version 2.6.2 (#470)2.6.2 | Dan Finlay | 2016-07-21 | 1 | -1/+1 |
| | | |||||
* | | typo fix | kumavis | 2016-07-19 | 1 | -1/+1 |
| | | |||||
* | | inpage - add try/catch to cleanContextForImports | kumavis | 2016-07-19 | 1 | -2/+10 |
|/ | |||||
* | Version 2.6.1 (#442) | Dan Finlay | 2016-07-14 | 1 | -1/+1 |
| | |||||
* | new tx - calculate estimatedGas and show thing in tx-details (#441) | kumavis | 2016-07-14 | 1 | -17/+37 |
| | | | | | | * new tx - calculate estimatedGas and show thing in tx-details * Bump changelog | ||||
* | Add Japanese localization file. | Kevin Serrano | 2016-07-14 | 1 | -0/+10 |
| | |||||
* | Fix MetaMask title for EN. | Kevin Serrano | 2016-07-14 | 1 | -1/+1 |
| | |||||
* | Add one wallet to new accounts instead of three. | Kevin Serrano | 2016-07-13 | 1 | -1/+1 |
| | |||||
* | Linted | Dan Finlay | 2016-07-12 | 2 | -14/+9 |
| | |||||
* | Merge branch 'master' into FixSvgIcons | Dan Finlay | 2016-07-12 | 1 | -1/+1 |
|\ | |||||
| * | Version 2.6 | Dan Finlay | 2016-07-12 | 1 | -1/+1 |
| | |