aboutsummaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Fix password validation and persistence issueDan Finlay2016-11-042-4/+8
| | | | Was wiping the vault on each successful password attempt... :P
* Implement private key exporting.Kevin Serrano2016-11-042-3/+22
|
* Finish fixing nicknaming bugDan Finlay2016-11-041-28/+39
|
* Fix account nicknaming bugDan Finlay2016-11-042-3/+8
| | | | When nicknaming, we weren't normalizing the input, and so we were retrieving with differently formatted addresses than we were persisting.
* Fix vault creation bugDan Finlay2016-11-041-17/+13
|
* Don't faucet during testsDan Finlay2016-11-041-1/+2
|
* Don't faucet in developmentDan Finlay2016-11-041-1/+3
|
* Fix dual vault creation bugDan Finlay2016-11-031-11/+4
|
* Fix initial vault creationDan Finlay2016-11-031-4/+8
|
* Fix handling of migrating old vault styleDan Finlay2016-11-033-46/+78
| | | | | | Now old vaults are recognized as an "Initialized" MetaMask instance. Upon logging in, when fetching the initial password-derived key, if there is no new-style vault, but there is an old style vault, it is migrated to the new format before proceeding through the usual unlocking steps.
* Add reveal of seed words.Kevin Serrano2016-11-022-2/+9
|
* Fixed bugs related to clearing caches when restoring to a new vaultDan Finlay2016-11-023-10/+48
|
* Fix seed phrase restoreDan Finlay2016-11-021-1/+1
|
* Made progress on parity for MultiVaultKevin Serrano2016-11-024-28/+60
| | | | | | | | | - Deleted some unused items - Renamed files and paths to match with new locations. - Modified keyring controller logic to separate concerns. - Fix account naming issues. - Enable creation of new vault with default HD keyring. - Formatting issues.
* Do not open MM page in dev mode.Kevin Serrano2016-11-021-1/+2
|
* Implement seed word confirmation page.Kevin Serrano2016-11-014-10/+29
| | | | | Remove logs. Move HD render files to ui/app.
* Implement auto-faucetingKevin Serrano2016-11-011-1/+6
|
* Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2016-10-313-6/+79
|\ | | | | | | i328-MultiVault
| * Now migrating old vaults to new DEN formatDan Finlay2016-10-293-6/+79
| |
* | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2016-10-293-7/+111
|\| | | | | | | i328-MultiVault
| * Configure BIP44 Keychain as default oneDan Finlay2016-10-292-7/+25
| |
| * Added hd wallet testsDan Finlay2016-10-281-4/+12
| |
| * Add hd wallet keyringDan Finlay2016-10-281-0/+78
| |
| * Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2016-10-264-27/+0
| |\ | | | | | | | | | i328-MultiVault
| * \ Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-261-9/+14
| |\ \
* | \ \ Merge branch 'master' into i328-MultiVaultKevin Serrano2016-10-292-12/+17
|\ \ \ \ | |_|_|/ |/| | |
| * | | Version 2.13.6Dan Finlay2016-10-271-1/+1
| | | |
| * | | Merge branch 'master' into i762-RenameWalletToAccountDan Finlay2016-10-271-2/+2
| |\ \ \
| | * | | Fix delegate call function reference 2Dan Finlay2016-10-261-1/+1
| | | | |
| | * | | Fix delegate call analysisDan Finlay2016-10-261-1/+1
| | | |/ | | |/| | | | | | | | | Fixed reference allowing transactions to be analyzed for delegate call again.
| * / | Rename wallet to accountDan Finlay2016-10-261-1/+1
| |/ / | | | | | | | | | Fixes #762
| * | Merge branch 'master' into i743-FixDelegateCallFlagkumavis2016-10-251-1/+1
| |\ \
| * \ \ Merge branch 'master' into i743-FixDelegateCallFlagKevin Serrano2016-10-192-2/+2
| |\ \ \
| * | | | Reproduced issue 743 in test caseDan Finlay2016-10-181-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
* | | | | Phase out extra warning screen.Kevin Serrano2016-10-264-27/+0
| |_|_|/ |/| | |
* | | | Fix loading indicationDan Finlay2016-10-221-1/+1
| | | |
* | | | Added tx & msg managing functionality to new KeyringControllerDan Finlay2016-10-222-1/+150
| | | |
* | | | Fix bug in new KeyringController vault restoring logic.Dan Finlay2016-10-221-3/+5
| | | |
* | | | Create basic keyring-controller unit test fileDan Finlay2016-10-222-12/+16
| | | |
* | | | Added SimpleKeyring testsDan Finlay2016-10-223-18/+27
| | | |
* | | | Added tx and msg signing to keychain & controllerDan Finlay2016-10-214-39/+134
| | | |
* | | | Improved simple account generationDan Finlay2016-10-212-34/+51
| | | |
* | | | Began adding first basic keyringDan Finlay2016-10-214-9/+146
| | | |
* | | | Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-211-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Add note about callback param to sync method warningDan Finlay2016-10-201-1/+1
| | |/ | |/|
* | | Fix testsDan Finlay2016-10-212-7/+9
| | |
* | | Linted & added salting to vaultDan Finlay2016-10-213-35/+26
| | |
* | | Fix state updating after vault creation and unlockingDan Finlay2016-10-211-2/+2
| | |
* | | Fix unlock logicDan Finlay2016-10-211-6/+17
| | |
* | | Git merge resolution.Kevin Serrano2016-10-207-5/+57
|\| |
| * | Version 2.13.5v2.13.5Dan Finlay2016-10-191-1/+1
| | |
| * | Wait for first metamask data to establish ping-pong stream.Dan Finlay2016-10-191-1/+1
| |/ | | | | | | | | | | Prevents infinite reload loops when dapps take too long to load. Fixes #746.
| * Restore hex prefix to gas priceDan Finlay2016-10-181-1/+1
| |
| * Increase gas estimate by 100000 weiDan Finlay2016-10-181-1/+9
| | | | | | | | | | | | To prevent minor gas estimation errors, probably usually related to operating on dynamic state. Fixes #738.
| * Version 2.13.4Dan Finlay2016-10-181-1/+1
| |
| * Merge branch 'master' into i735-xmlfixKevin Serrano2016-10-184-0/+33
| |\
| | * Fix for lintingFrankie2016-10-141-1/+1
| | |
| | * Create callback and Clean-up detailsFrankie2016-10-141-2/+7
| | |
| | * Specify base 10 in bignumberFrankie2016-10-141-1/+1
| | |
| | * Merge branch 'master' into i#495CustomGasFieldFrankie2016-10-147-37/+58
| | |\
| | * | Fix gasPrice rangeFrankie2016-10-144-4/+25
| | | |
| | * | Merge branch 'master' into i#495CustomGasFieldFrankie2016-10-124-2/+52
| | |\ \
| | * \ \ Merge branch 'master' into i#495CustomGasFieldFrankie2016-10-117-27/+16
| | |\ \ \
| | * | | | Add custom gas field to send pageFrankie2016-10-111-0/+7
| | | | | |
| * | | | | Lint.Kevin Serrano2016-10-161-1/+1
| | | | | |
| * | | | | Prevent XML from web3 injections.Kevin Serrano2016-10-161-2/+14
| | |_|_|/ | |/| | |
* | | | | Intermediary commit.Kevin Serrano2016-10-202-4/+44
| | | | |
* | | | | Remove unused crypto dependencies.Kevin Serrano2016-10-201-2/+0
| | | | |
* | | | | Merge in crypto.Kevin Serrano2016-10-201-0/+119
| | | | |
* | | | | Initial work on UI sideKevin Serrano2016-10-162-0/+26
| | | | |
* | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2016-10-132-13/+133
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | origin/i328-MultiVault
| * | | | Add minimal method signatures to new keyring controllerDan Finlay2016-10-132-14/+92
| | | | |
| * | | | Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-134-2/+52
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Add initial KeyringController filesDan Finlay2016-10-121-0/+42
| | |_|/ | |/| |
* | | | Merge branch 'master' into i695-dapp-reloadkumavis2016-10-131-2/+2
|\ \ \ \
| * | | | Remove logs.Kevin Serrano2016-10-131-2/+0
| | | | |
| * | | | Fix misnamed variable.Kevin Serrano2016-10-131-2/+4
| | |/ / | |/| |
* | | | Merge branch 'master' into i695-dapp-reloadkumavis2016-10-134-2/+52
|\| | |
| * | | Merge branch 'tos' of github.com:MetaMask/metamask-plugin into tosKevin Serrano2016-10-121-0/+2
| |\ \ \
| | * | | Fix bug where new vaults had no nicknamesDan Finlay2016-10-121-0/+2
| | | | |
| * | | | Cleanup.Kevin Serrano2016-10-121-2/+0
| |/ / /
| * | | lintKevin Serrano2016-10-121-2/+1
| | | |
| * | | Move tos hash comparison logic from background to mm controller.Kevin Serrano2016-10-122-27/+16
| | | |
| * | | Move tos hash logic to build phase. Create dynamic global variables based on ↵Kevin Serrano2016-10-121-1/+2
| | | | | | | | | | | | | | | | build.
| * | | Fix linting and guarantees set TOS hash.Kevin Serrano2016-10-071-0/+1
| | | |
| * | | Fix retention of terms of service hash across reloads of plugin.Kevin Serrano2016-10-071-1/+1
| | | |
| * | | Renamed variables to make more sense.Kevin Serrano2016-10-071-2/+2
| | | |
| * | | Add missing path require statement.Kevin Serrano2016-10-071-0/+1
| | | |
| * | | On update, check whether the TOS has changed using hashes.Kevin Serrano2016-10-061-1/+16
| | | |
| * | | Add controller functions for storing and checking TOS hashes.Kevin Serrano2016-10-061-1/+34
| | | |
| * | | Add new functions for storing TOS hashes in config manager.Kevin Serrano2016-10-061-0/+11
| |/ /
* / / dapp reload - fixed disconnect detection via pollingkumavis2016-10-136-35/+56
|/ /
* | Add tolerance for sending from mixed-case addresses.Dan Finlay2016-10-061-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 linkDan Finlay2016-10-061-4/+4
| |
* | Merge branch 'master' of github.com:MetaMask/metamask-plugin into Version-2.13.3kumavis2016-10-054-3/+4
|\ \
| * \ Merge branch 'master' into SmallerCopiedButtonkumavis2016-10-053-2/+3
| |\ \
| | * | Add Opera compatibilityDan Finlay2016-10-053-2/+3
| | | | | | | | | | | | | | | | | | | | - Fix incorrect OS key - Add additional icon image sizes.
| * | | Make popup a little tallerDan Finlay2016-10-051-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.3Dan Finlay2016-10-051-1/+1
|/ / | | | | | | Bumps provider-engine to fix log query filtering bug.
* | Version 2.13.2Dan Finlay2016-10-051-1/+1
| |
* | Improve popup behavior for parity errorsDan Finlay2016-10-041-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 readabilityFrankie2016-10-021-1/+1
|
* Fix issue #688 where fiat conversion does not persist when switching networksFrankie2016-10-011-1/+2
|
* Version 2.13.12.13.1Dan Finlay2016-09-231-1/+1
|
* Version 2.13.0Dan Finlay2016-09-191-1/+1
|
* Drop origin key from requests for Parity compatibilityDan Finlay2016-09-191-0/+5
|
* Merge branch 'master' into i#519buyButtonTxConfFrankie2016-09-162-17/+10
|\
| * Version 2.12.12.12.1Dan Finlay2016-09-151-1/+1
| |
| * Merge branch 'master' into i#626Frankie2016-09-151-1/+1
| |\
| | * Version 2.12.02.12.0Dan Finlay2016-09-151-1/+1
| | |
| | * Version 2.11.2Dan Finlay2016-09-151-1/+1
| | |
| * | Remove unused argumentFrankie2016-09-151-1/+1
| | |
| * | Fix popup flag assignmentDan Finlay2016-09-151-2/+1
| | |
| * | Dont generate a popup notification when submiting a transaction from with in ↵Frankie2016-09-151-17/+11
| |/ | | | | | | MetaMask
* / Change Testfaucet urlFrankie2016-09-161-1/+1
|/
* Merge pull request #655 from MetaMask/FixPortStreamEndkumavis2016-09-142-5/+10
|\ | | | | | | Fix port stream end bug
| * Fix port stream end bugDan Finlay2016-09-141-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 librarykumavis2016-09-133-62/+91
|\
| * Fix cache clearing reference for OperaDan Finlay2016-09-132-2/+2
| | | | | | | | For some reason Chrome didn't mind this awful bug, but Opera caught it.
| * Version 2.11.0Dan Finlay2016-09-131-1/+1
| |
| * Make cache clearning error tolerantDan Finlay2016-09-131-1/+6
| |
| * Fix clearing of account cache on vault restoreDan Finlay2016-09-131-3/+7
| |
| * LintedDan Finlay2016-09-131-2/+2
| |
| * Load accounts into ethStore on unlockDan Finlay2016-09-131-0/+1
| |
| * Add accounts back to metamask stateDan Finlay2016-09-131-1/+5
| |
| * Fix keystore referenceDan Finlay2016-09-131-0/+1
| |
| * Fix some referencesDan Finlay2016-09-131-2/+2
| |
| * Fix account unlockingDan Finlay2016-09-132-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 bundlekumavis2016-09-131-1/+1
| |
* | popup - breakout popup-corekumavis2016-09-132-61/+71
| |
* | popup - further clean and commentkumavis2016-09-131-17/+13
| |
* | ui - remove unused currentDomain propkumavis2016-09-131-17/+2
| |
* | Revert "Add new eth-lightwallet salting to vault."Frankie2016-09-131-64/+61
|/
* Select first address when restoring vaultDan Finlay2016-09-121-2/+10
| | | | Fixes #642
* Fix ethStore pushed addressesDan Finlay2016-09-121-1/+1
| | | | Needed to add hex prefix always.
* Fixed caching bugDan Finlay2016-09-111-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 restoreDan Finlay2016-09-111-7/+16
|
* Captured #640 in failing testDan Finlay2016-09-111-0/+5
|
* Add new eth-lightwallet salting to vault.Dan Finlay2016-09-101-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 Serrano2016-09-101-2/+4
|
* Only init one wallet on restoreDan Finlay2016-09-091-1/+1
| | | | Fixes #610
* Reverting memory leak fixDan Finlay2016-09-071-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 changelogDan Finlay2016-09-071-25/+0
|
* Ensure listener is cleaned upDan Finlay2016-09-073-1/+27
| | | | Also fixed bug when validating a tx with no value.
* Merge branch 'master' into first-timeKevin Serrano2016-09-071-0/+10
|\
| * Add negative value validation to tx approvalDan Finlay2016-09-071-0/+10
| |
* | Replace chrome with generalized browser API.Kevin Serrano2016-09-071-2/+2
| |
* | Redirect to video in a new tab on fresh install.Kevin Serrano2016-09-071-1/+6
|/
* lintingVincent Serpoul2016-09-061-1/+1
|
* Error message more helpfulVincent Serpoul2016-09-061-2/+3
|
* Version 2.10.2kumavis2016-09-031-1/+1
|
* notif - use standard err-first callback stylekumavis2016-09-031-18/+24
|
* Version 2.10.1kumavis2016-09-031-1/+1
|
* Merge branch 'master' into i566-NoPopupWhenOpenDan Finlay2016-09-021-4/+18
|\
| * inpage - remap ids on responsekumavis2016-09-011-4/+18
| |
* | LintedDan Finlay2016-09-021-1/+1
| |
* | Do not open popup for internally produced txsDan Finlay2016-09-021-11/+19
|/
* Add metamask route to infura urlsDan Finlay2016-09-011-2/+2
| | | | | | Fixes #597 Allows metamask-specific RPC metrics.
* Remove old notification cleanup codeDan Finlay2016-08-301-10/+0
|
* Make popup a type Edge supportsDan Finlay2016-08-301-1/+2
|
* Add extra edge compatibilityDan Finlay2016-08-301-2/+13
|
* Fix console.error referencesDan Finlay2016-08-301-3/+3
| | | | Microsoft edge does not support console.error.bind, nor is that call necessary here.
* Remove bind calls from console errorsDan Finlay2016-08-301-4/+4
|
* Merge branch 'master' into EdgeCompatibilityDan Finlay2016-08-3022-324/+329
|\
| * Version 2.10.0Dan Finlay2016-08-301-1/+1
| |
| * Merge branch 'master' into i#563forgotPasswordFrankie2016-08-267-180/+94
| |\
| | * Merge branch 'master' into PopupNotificationsDan Finlay2016-08-261-5/+5
| | |\
| | * \ Merge branch 'master' into PopupNotificationsDan Finlay2016-08-253-3/+4
| | |\ \
| | * \ \ Merge branch 'master' into PopupNotificationsDan Finlay2016-08-251-0/+10
| | |\ \ \
| | * \ \ \ Merge branch 'master' into PopupNotificationsDan Finlay2016-08-241-0/+0
| | |\ \ \ \
| | * | | | | Close notification on opening main UIDan Finlay2016-08-242-2/+16
| | | | | | |
| | * | | | | Skip popup dismissal in testsDan Finlay2016-08-241-0/+6
| | | | | | |
| | * | | | | LintedDan Finlay2016-08-241-1/+0
| | | | | | |
| | * | | | | Close popup even if last tx is dismissed from main UIDan Finlay2016-08-241-8/+14
| | | | | | |
| | * | | | | Emit updates to all listeners on pending tx updatesDan Finlay2016-08-243-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 PopupNotificationsDan Finlay2016-08-233-3/+35
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into PopupNotificationsDan Finlay2016-08-233-0/+30
| | |\ \ \ \ \ \
| | * | | | | | | Limit to one popup, re-focus on additional notifications.Dan Finlay2016-08-231-6/+17
| | | | | | | | |
| | * | | | | | | Merge branch 'master' into PopupNotificationsDan Finlay2016-08-234-1/+42
| | |\ \ \ \ \ \ \
| | * | | | | | | | LintedDan Finlay2016-08-171-15/+5
| | | | | | | | | |
| | * | | | | | | | MVP Popup Notifications WorkingDan Finlay2016-08-173-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 filesDan Finlay2016-08-175-3/+27
| | | | | | | | | |
| | * | | | | | | | Merge branch 'master' into PopupNotificationsDan Finlay2016-08-174-0/+82
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Set up MVP for popup-based notifications.Dan Finlay2016-08-174-128/+106
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into i#563forgotPasswordFrankie2016-08-269-6/+79
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | Bump versioning.Kevin Serrano2016-08-251-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'master' into shortcut-fixKevin Serrano2016-08-251-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | | * | | | | | | | Version 2.9.1Dan Finlay2016-08-251-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Fixed prohibited shortcut combination.Kevin Serrano2016-08-251-4/+4
| | |/ / / / / / / /
| | * | | | | | | | Merge branch 'master' into i484PersistPendingSignaturesDan Finlay2016-08-252-2/+12
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Implement usage of nock.Kevin Serrano2016-08-251-22/+12
| | | | | | | | | | |
| | | * | | | | | | | Added mock option to function.Kevin Serrano2016-08-251-13/+23
| | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | * | | | | | | Change shortcut again to Ctrl+Alt+MKevin Serrano2016-08-251-4/+4
| | | | | | | | | |
| | | * | | | | | | Change shortcut to Alt+MKevin Serrano2016-08-251-4/+4
| | | | | | | | | |
| | | * | | | | | | Add shortcut for opening MetaMask.Kevin Serrano2016-08-241-0/+10
| | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | LintedDan Finlay2016-08-251-1/+1
| | | | | | | | |
| | * | | | | | | Fix bug where unconfirmed message sig is lost when locked.Dan Finlay2016-08-251-0/+1
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #484 Adds unsigned messages to the in-memory message list before showing the unlock message.
| | * | | | | | Merge branch 'master' into fox-subKevin Serrano2016-08-246-3/+65
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Merge branch 'master' into kumavis-patch-1kumavis2016-08-231-0/+6
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch 'master' into i390-TransactionLimitkumavis2016-08-234-2/+58
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge branch 'master' into i390-TransactionLimitDan Finlay2016-08-234-1/+42
| | | | |\ \ \ \ \ \ | | | | | | |_|_|/ / | | | | | |/| | | |
| | | | * | | | | | Enforce tx history limitDan Finlay2016-08-191-0/+6
| | | | | |_|_|/ / | | | | |/| | | |
| | | * | | | | | inpage - cleanContextForImports fixkumavis2016-08-231-1/+1
| | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | set to undefined instead of deleting updates #447
| | | * | | | | Merge branch 'master' into i479kumavis2016-08-233-0/+30
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | First part of chinese translation.Kevin Serrano2016-08-231-0/+10
| | | | | | | |
| | | | * | | | Add spanish locales.Kevin Serrano2016-08-232-0/+20
| | | | | |/ / | | | | |/| |
| | | * / | | inpage provider - reassign incomming idskumavis2016-08-231-2/+28
| | | |/ / /
| | * / / / Created option to pass in static file for fallback for logo.Kevin Serrano2016-08-241-0/+0
| | |/ / /
| * / / / Add a back button on lock screen to go back to init menuFrankie2016-08-261-0/+5
| |/ / /
| * | | Version 2.9.0Dan Finlay2016-08-231-1/+1
| | | |
| * | | Create a ShapeShift tx in tx HistoryFrankie2016-08-192-7/+8
| | | |
| * | | Merge branch 'master' into shapeshiftTxFrankie2016-08-195-1/+83
| |\| |
| | * | Added compliance for tests and properly accounts for N/A conversions.Kevin Serrano2016-08-171-3/+3
| | | |
| | * | Fix uncalled fn.Kevin Serrano2016-08-171-1/+1
| | | |
| | * | Add fallback to API failure.Kevin Serrano2016-08-171-0/+2
| | | |
| | * | Remove logging. Clean up duplicate entries in currency list.Kevin Serrano2016-08-171-1/+0
| | | |
| | * | Merge branch 'master' into usd-conversionKevin Serrano2016-08-171-1/+1
| | |\|
| | | * Version 2.8.0Dan Finlay2016-08-161-1/+1
| | | |
| | * | Merge master.Kevin Serrano2016-08-1611-140/+30
| | |\|
| | * | Did not previously call functions before!Kevin Serrano2016-08-101-3/+3
| | | |
| | * | Fix default value. Add loading indication for async.Kevin Serrano2016-08-101-1/+1
| | | |
| | * | Enable full listing of supported currencies by Cryptonator.Kevin Serrano2016-08-101-0/+1
| | | |
| | * | Get fiat numbers rendering on tooltip. Need to find way to create line breaks.Kevin Serrano2016-08-061-6/+0
| | | |
| | * | Merge branch 'master' into usd-conversionKevin Serrano2016-08-057-18/+59
| | |\ \
| | * \ \ Fix merge conflicts. Fix typos. Ensure currency immediately updated on load.Kevin Serrano2016-07-234-10/+52
| | |\ \ \
| | * | | | Linting!Kevin Serrano2016-07-232-3/+5
| | | | | |
| | * | | | Change function names. Add interval polling for api. Refactor functions.Kevin Serrano2016-07-222-8/+31
| | | | | |
| | * | | | Add date access throughout the data flow.Kevin Serrano2016-07-223-4/+6
| | | | | |
| | * | | | Provide date access.Kevin Serrano2016-07-221-1/+8
| | | | | |
| | * | | | Merge branch 'master' into usd-conversionKevin Serrano2016-07-2211-34/+113
| | |\ \ \ \
| | * | | | | Add data field to pass up parameters up to reducer.Kevin Serrano2016-07-222-2/+9
| | | | | | |
| | * | | | | Add fiat actions to metamask controllere and actions.Kevin Serrano2016-07-221-0/+10
| | | | | | |
| | * | | | | Progress on config manager. Plus tests.Kevin Serrano2016-07-211-0/+27
| | | | | | |
| * | | | | | WIP: ShapeShift txFrankie2016-08-193-0/+40
| | |_|_|_|/ | |/| | | |
| * | | | | Remove ethereum classic providerDan Finlay2016-08-152-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #542
| * | | | | deps - extracted ensnare to modulekumavis2016-08-132-25/+1
| | | | | |
| * | | | | Add global var for background.Kevin Serrano2016-08-124-5/+15
| | | | | |
| * | | | | Merge github.com:MetaMask/metamask-plugin into logging-fixKevin Serrano2016-08-124-100/+7
| |\ \ \ \ \
| | * | | | | inpage-prov - sync error - fix linkkumavis2016-08-121-1/+1
| | | | | | |
| | * | | | | deps - local-message-stream extracted as module post-message-streamkumavis2016-08-123-58/+2
| | | | | | |
| | * | | | | clean -formattingkumavis2016-08-121-2/+2
| | | | | | |
| | * | | | | inpage-provider - remove createSyncProvider, just failkumavis2016-08-121-40/+3
| | | | | | |
| * | | | | | Create global variable that changes ui logging.Kevin Serrano2016-08-122-9/+2
| | | | | | |
| * | | | | | Setting defaults to production.Kevin Serrano2016-08-121-1/+1
| | | | | | |
| * | | | | | Separate developmentMode conditional to only wrap log.Kevin Serrano2016-08-121-2/+4
| | | | | | |
| * | | | | | Merge branch 'master' into logging-fixKevin Serrano2016-08-122-3/+7
| |\| | | | |
| | * | | | | Fix ether warning checkbox.Kevin Serrano2016-08-112-3/+7
| | | |_|_|/ | | |/| | |
| * | | | | LintKevin Serrano2016-08-121-1/+1
| | | | | |
| * | | | | Add ability to hide logging messages in production.Kevin Serrano2016-08-122-3/+7
| |/ / / /
* / / / / Add MSFT Edge keys to manifest.jsonDan Finlay2016-08-081-1/+3
|/ / / /