aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG.md
Commit message (Collapse)AuthorAgeFilesLines
...
| * Version 3.2.1v3.2.1Dan Finlay2017-02-091-1/+5
| |
* | Allowed net_version to be called synchronouslyKevin Serrano2017-02-091-0/+2
|/
* Version 3.2.0v3.2.0Dan Finlay2017-02-081-1/+3
|
* Add to CHANGELOGFrankie2017-02-021-0/+1
|
* Merge branch 'dev' into i#1048kumavis2017-01-251-0/+2
|\
| * add to CHANGELOGFrankie2017-01-251-0/+1
| |
| * Merge branch 'master' into upToDateFrankie2017-01-211-0/+3
| |\
| * | Bump changelogDan Finlay2017-01-191-0/+2
| | |
* | | 3.1.2kumavis2017-01-251-0/+5
| |/ |/|
* | 3.1.1kumavis2017-01-211-0/+4
|/
* Merge branch 'master' into Version-3.1.0Dan Finlay2017-01-191-0/+1
|\
| * Add to CHANGELOGFrankie2017-01-191-0/+2
| |
* | Version 3.1.0Dan Finlay2017-01-191-0/+2
| |
* | Merge branch 'dev' into i715-AddImportMenukumavis2017-01-191-0/+1
|\ \
| * | Bump changelogDan Finlay2017-01-191-0/+2
| | |
* | | Bump changelogDan Finlay2017-01-181-0/+2
|/ /
* | Version 3.0.1Dan Finlay2017-01-171-0/+2
| |
* | Bump changelogDan Finlay2017-01-171-0/+2
|/
* Version 3.0.0Dan Finlay2017-01-171-0/+2
|
* Bump changelog to mention BIP44 fixDan Finlay2017-01-171-0/+1
|
* Merge branch 'master' into devDan Finlay2017-01-171-0/+2
|\
| * add to CHANGELOGFrankie2017-01-111-0/+1
| |
| * make CHANGELOG more human readableFrankie2016-12-211-1/+1
| |
| * Add to CHANGELOG.mdFrances Pangilinan2016-12-211-0/+1
| |
* | add to CHANGELOGFrankie2017-01-151-0/+1
| |
* | Add to CHANGELOGFrankie2017-01-121-0/+1
| |
* | changelog - add note on rpc overrideskumavis2017-01-111-0/+2
| |
* | Bump changelogDan Finlay2017-01-111-0/+1
| |
* | Merge branch 'dev' into network-indicator-refactorKevin Serrano2017-01-061-0/+2
|\ \
| * \ Merge branch 'dev' into fixTxManagerDan Finlay2017-01-061-0/+1
| |\ \
| | * | Bump changelogDan Finlay2017-01-051-0/+1
| | | |
| * | | Merge branch 'TxManager' of https://github.com/MetaMask/metamask-plugin into ↵Frankie2017-01-051-0/+1
| |\ \ \ | | |/ / | |/| | | | | | TxManager
| | * | Bump changelogDan Finlay2017-01-031-0/+1
| | | |
* | | | Changelog.Kevin Serrano2017-01-051-0/+2
|/ / /
* | | Changelog.Kevin Serrano2017-01-041-1/+1
| | |
* | | Changelog.Kevin Serrano2017-01-041-0/+1
|/ /
* | Merge branch 'dev' into TxManagerFrankie2016-12-221-0/+16
|\ \
| * | Add to changelog.Kevin Serrano2016-12-211-0/+1
| | |
| * | Merge pull request #942 from MetaMask/Version-2.14.1Dan Finlay2016-12-211-0/+2
| |\ \ | | | | | | | | Version 2.14.1
| | * | Version 2.14.12.14.1Dan Finlay2016-12-211-0/+2
| | |/
| * | Merge pull request #937 from MetaMask/i900-forgot-password-flowDan Finlay2016-12-201-0/+1
| |\ \ | | | | | | | | I900 forgot password flow
| | * | Add to changelog.Kevin Serrano2016-12-201-0/+1
| | | |
| * | | Merged master into devDan Finlay2016-12-201-0/+11
| |\ \ \ | | |/ / | |/| / | | |/
| | * changelog - add whitespacekumavis2016-12-201-0/+1
| | |
| | * changelog - inf reload detection hotfixkumavis2016-12-201-3/+5
| | |
| | * changelog - add note on inf reload detection hotfixkumavis2016-12-201-1/+1
| | |
| | * Add ability to show notices to user & get confirmation.Kevin Serrano2016-12-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement generation of markdown for notice files. Create npm command. Enhance notice generation. Add test files to test multiple notices. Add basic markdown support to notices. Interval checks for updates. Add extensionizer and linker Add terms and conditions state file Add link support to disclaimer. Changelog addition.
| | * Bump changelog for removing mordenDan Finlay2016-12-161-0/+1
| | |
| | * deps - bump provider-engine for bug fixkumavis2016-12-131-0/+1
| | |
| | * changelog - "fix reload detection"kumavis2016-12-081-0/+2
| | |
| | * Version 2.13.112.13.11Dan Finlay2016-11-241-0/+2
| | |
* | | add to CHANGELOG.mdFrances Pangilinan2016-12-151-0/+1
|/ /
* | Merge branch 'master' into devDan Finlay2016-11-241-0/+11
|\|
| * changelog - add sync rpc eth_uninstallFilter notekumavis2016-11-241-0/+2
| |
| * Version 2.13.102.13.10Dan Finlay2016-11-231-2/+6
| |
| * Merge branch 'master' into new-faucetDan Finlay2016-11-231-0/+2
| |\
| | * Bump changelogDan Finlay2016-11-221-0/+2
| | |
| * | Add to changelog.Kevin Serrano2016-11-231-0/+1
| |/
| * Version 2.13.92.13.9Dan Finlay2016-11-221-0/+2
| |
* | Phase out ethereumjs-util from encryptor module.Kevin Serrano2016-11-231-0/+1
| |
* | Make ropsten faucet button point at the correct url.Kevin Serrano2016-11-231-0/+1
| |
* | Merge pull request #837 from MetaMask/FixMenuItemKevin Serrano2016-11-221-0/+1
|\ \ | |/ |/| Fix custom provider menu item
| * Fix custom provider menu itemDan Finlay2016-11-221-0/+1
| | | | | | | | The Custom RPC menu item in the provider menu would not appear when Localhost:8545 was selected.
* | Begin adding Ropsten supportDan Finlay2016-11-221-0/+1
|/ | | | | | | | Ropsten links will still not work until Etherscan publishes their ropsten link format. At that time we will need to update ui/lib/account-link.js Otherwise, fixes #831
* Increment tx ids to avoid collisionsDan Finlay2016-11-181-0/+2
| | | | | | | | | | Fixes #791 It was possible for two requests to have the same ID, causing a crash and loss of StreamProvider connection. This new id generation strategy creates a random ID, and increments it for each request. In case the id generator is included from two different processes, I'm initializing the counter at a random number, and rolling it over a large number when it gets too big.
* Version 2.13.82.13.8Dan Finlay2016-11-171-1/+4
|
* Add to changelog.Kevin Serrano2016-11-151-0/+1
|
* changelog - updatekumavis2016-11-111-0/+1
|
* Fix bug for increasing gas by 20 percent.Kevin Serrano2016-11-101-0/+1
|
* Version 2.13.7Dan Finlay2016-11-091-0/+2
|
* Adjust gas buffer to be 20% over estimateDan Finlay2016-11-091-1/+1
|
* Increase gas bufferDan Finlay2016-11-091-1/+2
| | | | Fixes #795
* Fix gas price bufferingDan Finlay2016-11-081-0/+1
| | | | | | | Our gas price buffering logic had a bug, because bn.js has inconsistent behavior when using hex-prefixed output. The issue has been opened with them here: https://github.com/indutny/bn.js/issues/151 We've corrected our usage in the mean time.
* Fix github link on info pageDan Finlay2016-11-011-0/+2
|
* Merge branch 'master' into UpdateWeb3Dan Finlay2016-10-271-0/+2
|\
| * Version 2.13.6Dan Finlay2016-10-271-0/+2
| |
* | Merge branch 'master' into UpdateWeb3Dan Finlay2016-10-271-0/+4
|\|
| * Merge branch 'master' into i762-RenameWalletToAccountDan Finlay2016-10-271-0/+2
| |\
| | * Merge branch 'master' into 761-FixCustomMordenIndicationDan Finlay2016-10-271-0/+1
| | |\
| | * | Bump changelogDan Finlay2016-10-261-0/+2
| | | |
| * | | Merge branch 'master' into i762-RenameWalletToAccountDan Finlay2016-10-271-0/+1
| |\ \ \ | | | |/ | | |/|
| | * | Fix delegate call analysisDan Finlay2016-10-261-0/+1
| | |/ | | | | | | | | | Fixed reference allowing transactions to be analyzed for delegate call again.
| * / Rename wallet to accountDan Finlay2016-10-261-0/+1
| |/ | | | | | | Fixes #762
* / Update web3.js versionDan Finlay2016-10-261-0/+1
|/
* Fix CHANGELOGFrankie2016-10-201-0/+1
|
* Merge branch 'master' into i#741Frankie2016-10-201-0/+4
|\
| * Fix changelog dateDan Finlay2016-10-191-1/+1
| |
| * Version 2.13.5v2.13.5Dan Finlay2016-10-191-0/+2
| |
| * Wait for first metamask data to establish ping-pong stream.Dan Finlay2016-10-191-0/+2
| | | | | | | | | | | | Prevents infinite reload loops when dapps take too long to load. Fixes #746.
* | Add unit test for isHex and add to CHANGELOG.mdFrankie2016-10-201-0/+1
|/
* Increase gas estimate by 100000 weiDan Finlay2016-10-181-0/+2
| | | | | | To prevent minor gas estimation errors, probably usually related to operating on dynamic state. Fixes #738.
* Version 2.13.4Dan Finlay2016-10-181-1/+3
|
* Merge branch 'master' into i735-xmlfixKevin Serrano2016-10-181-0/+1
|\
| * Merge branch 'master' into i#495CustomGasFieldFrankie2016-10-121-0/+5
| |\
| * | Add to CHANGELOGFrankie2016-10-111-0/+2
| | |
* | | Bump changelog.Kevin Serrano2016-10-161-0/+2
| |/ |/|
* | Merge branch 'master' into i721-ScrollAccountListDan Finlay2016-10-121-0/+4
|\ \
| * | Modify changelog.Kevin Serrano2016-10-071-0/+1
| | |
| * | Merge branch 'master' into tosKevin Serrano2016-10-061-0/+3
| |\|
| * | Add to changelog.Kevin Serrano2016-10-051-0/+3
| | |
* | | Bump changelogDan Finlay2016-10-121-0/+1
| |/ |/|
* | Merge branch 'master' of github.com:MetaMask/metamask-plugin into Version-2.13.3kumavis2016-10-051-0/+2
|\|
| * Merge branch 'master' into SmallerCopiedButtonFrankie2016-10-051-0/+1
| |\
| * | Bump changelogDan Finlay2016-10-051-0/+1
| | |
| * | Make seed word confirmation button font smallerDan Finlay2016-10-051-0/+2
| | | | | | | | | | | | To avoid formatting glitches on some machines.
* | | Version 2.13.3Dan Finlay2016-10-051-0/+4
| |/ |/| | | | | Bumps provider-engine to fix log query filtering bug.
* | Removed hex prefix from private key exportDan Finlay2016-10-051-0/+1
|/ | | | | | For compatibility with Jaxx, MEW, and Geth. Fixes #687
* Version 2.13.2Dan Finlay2016-10-051-0/+3
|
* Improve popup behavior for parity errorsDan Finlay2016-10-041-0/+1
| | | | 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.
* Add to CHANGELOGFrankie2016-10-011-0/+2
|
* Version 2.13.12.13.1Dan Finlay2016-09-231-1/+5
|
* Merge branch 'master' into i675-LoadingBuyDan Finlay2016-09-221-0/+3
|\
| * Version 2.13.0Dan Finlay2016-09-191-1/+3
| |
| * Drop origin key from requests for Parity compatibilityDan Finlay2016-09-191-0/+1
| |
* | Merge branch 'master' into i675-LoadingBuyDan Finlay2016-09-161-0/+2
|\|
| * Fix CHANGELOG.md and restructure onClick eventsFrankie2016-09-161-1/+1
| |
| * Merge branch 'master' into tx-vizFrankie2016-09-161-0/+1
| |\
| * | Add to CHANGELOG.mdFrankie2016-09-161-0/+3
| | |
* | | Show loading indication when selecting ShapeShiftDan Finlay2016-09-161-0/+2
| |/ |/|
* | bump changelogkumavis2016-09-161-0/+1
|/
* Version 2.12.12.12.1Dan Finlay2016-09-151-1/+3
|
* Merge branch 'master' into i#626Frankie2016-09-151-1/+4
|\
| * Version 2.11.2Dan Finlay2016-09-151-1/+4
| |
* | Add to CHANGELOG.mdFrankie2016-09-151-0/+3
|/
* Merge branch 'i646-ClosePopupBug' of github.com:MetaMask/metamask-plugin ↵Dan Finlay2016-09-141-0/+1
|\ | | | | | | into i646-ClosePopupBug
| * Merge branch 'master' into qrCodeFrankie2016-09-141-0/+4
| |\
| * \ Merge branch 'master' into qrCodeFrankie2016-09-131-0/+2
| |\ \
| * | | Add to CHANGELOG.mdFrankie2016-09-131-0/+1
| | | |
* | | | Bump changelogDan Finlay2016-09-141-0/+3
| |_|/ |/| |
* | | Fix cache clearing reference for OperaDan Finlay2016-09-131-0/+4
| |/ |/| | | | | For some reason Chrome didn't mind this awful bug, but Opera caught it.
* | Version 2.11.0Dan Finlay2016-09-131-0/+2
|/
* Revert "Add new eth-lightwallet salting to vault."Frankie2016-09-131-1/+0
|
* Bump changelogDan Finlay2016-09-101-0/+1
|
* Update changelogKevin Serrano2016-09-101-1/+1
|
* Merge branch 'i610-InitOneWalletOnly' of github.com:MetaMask/metamask-plugin ↵Kevin Serrano2016-09-101-0/+1
|\ | | | | | | into i610-InitOneWalletOnly
| * Bump changelogDan Finlay2016-09-091-0/+1
| |
* | Show loading indication during unlocking.Dan Finlay2016-09-091-0/+1
|/
* Merge branch 'i#589pendingTxsIssue' of ↵Frankie2016-09-091-0/+1
|\ | | | | | | https://github.com/MetaMask/metamask-plugin into i#589pendingTxsIssue
| * Merge branch 'master' into i#589pendingTxsIssueFrankie2016-09-091-0/+1
| |\
| | * Bump changelogDan Finlay2016-09-091-0/+1
| | |
* | | Fix wording in changelog and bugFrankie2016-09-091-1/+1
|/ /
* / Add to CHANGELOG.md and Remove unnecessary catchFrankie2016-09-091-0/+1
|/
* Merge branch 'master' into ModularFiatBalanceDan Finlay2016-09-071-0/+3
|\
| * Bump changelogDan Finlay2016-09-071-0/+1
| |
| * Update changelog and merge master.Kevin Serrano2016-09-071-0/+1
| |
| * Add to changelog.Kevin Serrano2016-09-071-0/+2
| |
* | Bump changelogDan Finlay2016-09-071-0/+2
|/
* Merge branch 'master' into livereloadKevin Serrano2016-09-031-0/+4
|\
| * Version 2.10.2kumavis2016-09-031-0/+4
| |
* | Merge branch 'master' into livereloadKevin Serrano2016-09-031-0/+3
|\|
| * Version 2.10.1kumavis2016-09-031-0/+3
| |
* | Changelog add.Kevin Serrano2016-09-031-1/+1
| |
* | Changelog add and rename vars.Kevin Serrano2016-09-031-0/+1
|/
* Bump changelogDan Finlay2016-09-021-0/+1
|
* Bump changelogDan Finlay2016-08-301-0/+2
|
* Version 2.10.0Dan Finlay2016-08-301-3/+4
|
* Merge branch 'master' into i#563forgotPasswordFrankie2016-08-261-1/+3
|\
| * Merge branch 'master' into PopupNotificationsDan Finlay2016-08-261-0/+6
| |\
| | * Bump changelogDan Finlay2016-08-261-1/+2
| | |
| * | Merge branch 'master' into PopupNotificationsDan Finlay2016-08-251-0/+5
| |\ \
| * \ \ Merge branch 'master' into PopupNotificationsDan Finlay2016-08-251-0/+1
| |\ \ \
| * \ \ \ Merge branch 'master' into PopupNotificationsDan Finlay2016-08-241-0/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into PopupNotificationsDan Finlay2016-08-231-0/+2
| |\ \ \ \ \
| * | | | | | Merge masterDan Finlay2016-08-231-1/+2
| | | | | | |
| * | | | | | Merge branch 'master' into PopupNotificationsDan Finlay2016-08-231-0/+5
| |\ \ \ \ \ \
| * | | | | | | Bump changelogDan Finlay2016-08-171-0/+1
| | | | | | | |
* | | | | | | | Merge branch 'master' into i#563forgotPasswordFrankie2016-08-261-0/+14
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Bump versioning.Kevin Serrano2016-08-251-0/+5
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Version 2.9.1Dan Finlay2016-08-251-0/+2
| | | | | | |
| * | | | | | Merge branch 'master' into i484PersistPendingSignaturesDan Finlay2016-08-251-0/+3
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into api-test-fixKevin Serrano2016-08-251-0/+1
| | |\ \ \ \ \ \
| | | * | | | | | Bump changelogDan Finlay2016-08-251-0/+1
| | | | |_|_|_|/ | | | |/| | | |
| | * / | | | | Changelog change.Kevin Serrano2016-08-251-0/+1
| | |/ / / / /
| | * | | | | Clarify shortcut.Kevin Serrano2016-08-251-1/+1
| | | | | | |
| | * | | | | Change shortcut again to Ctrl+Alt+MKevin Serrano2016-08-251-1/+1
| | | | | | |
| | * | | | | Change shortcut to Alt+MKevin Serrano2016-08-251-1/+1
| | | | | | |
| | * | | | | Update changelog.Kevin Serrano2016-08-241-0/+1
| | | |_|_|/ | | |/| | |
| * / | | | Bump changelogDan Finlay2016-08-251-0/+1
| |/ / / /
| * | | | Merge branch 'master' into fox-subKevin Serrano2016-08-241-0/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Removed view more button, added account info button.Dan Finlay2016-08-231-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: - Also fixed bug that caused React warning when rendering the tx history. - Renamed 'Transactions' to 'History', since it now has more than that.
| | * | | Merge branch 'master' into i390-TransactionLimitDan Finlay2016-08-231-0/+4
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge branch 'master' into i390-TransactionLimitDan Finlay2016-08-191-0/+1
| | |\ \ \
| | * | | | Added `view more` button to transaction listDan Finlay2016-08-191-0/+2
| | | |_|/ | | |/| | | | | | | | | | | | Visible at the end of the transaction list, or if no transactions are listed, displayed right after the `No Transactions` message.
| * | | | Changelog.Kevin Serrano2016-08-241-0/+2
| | |_|/ | |/| |
* / | | Add to CHANGELOGFrankie2016-08-261-1/+5
|/ / /
* | | Version 2.9.0Dan Finlay2016-08-231-0/+2
| | |
* | | Merge branch 'master' into shapeshiftTxDan Finlay2016-08-191-0/+1
|\ \ \ | | |/ | |/|
| * | Bump changelog.Kevin Serrano2016-08-191-0/+1
| |/
* | Remove "+" from shapeshift tx and change wording in CHANGELOGFrankie2016-08-191-1/+1
| |
* | Make ballance teal for shapeshift tx and add to change logFrankie2016-08-191-0/+2
|/
* Add to changelog.Kevin Serrano2016-08-171-0/+2
|
* Version 2.8.0Dan Finlay2016-08-161-0/+2
|
* Remove ethereum classic providerDan Finlay2016-08-151-0/+2
| | | | Fixes #542
* Add to change logFrankie2016-08-141-1/+2
|
* changelog - add note about web3-provider-stream fixkumavis2016-08-121-0/+1
|
* Add to changelog.Kevin Serrano2016-08-051-0/+2
|
* Bump changelogDan Finlay2016-07-301-0/+4
|
* Version 2.7.2Dan Finlay2016-07-301-0/+2
|
* Merge branch 'master' into AddEthClassicDan Finlay2016-07-291-0/+1
|\
| * Fix broken reference to host store.didUpdateDan Finlay2016-07-291-0/+2
| | | | | | | | I'd returned this line because it seemed to fix Firefox compatibility, now it seems like that wasn't the case. Removing it again.
* | Bump changelogDan Finlay2016-07-291-0/+2
|/
* Version 2.7.1Dan Finlay2016-07-281-1/+3
|
* Changelog add.Kevin Serrano2016-07-271-0/+1
|
* Cleanup ChangelogDan Finlay2016-07-271-2/+3
|
* Merge remote-tracking branch 'origin/Version2.7.0' into FixChromeBuildDan Finlay2016-07-271-0/+2
|\
| * Version 2.7.02.7.0Dan Finlay2016-07-221-0/+2
| |
* | Add platform specific builds and zip tasks (#486)Dan Finlay2016-07-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Bump changelogDan Finlay2016-07-261-0/+1
| |
* | Manifest fix for firefox-specific field (#475)Kevin Serrano2016-07-221-0/+1
|/ | | | | | * Remove firefox-only manifest.json line. * Changelog change.
* Buy button (#474)Frankie2016-07-221-0/+2
| | | | | | | | | | | | | | | | | | | * 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
* Make injected web3 fail hard on sync methods (#471)Dan Finlay2016-07-211-0/+2
| | | Make injected web3 fail hard on sync methods
* Version 2.6.2 (#470)2.6.2Dan Finlay2016-07-211-0/+2
|
* Update Changelog to account for last PRKevin Serrano2016-07-191-0/+1
|
* Bump changelogDan Finlay2016-07-161-0/+2
|
* Version 2.6.1 (#442)Dan Finlay2016-07-141-0/+2
|
* new tx - calculate estimatedGas and show thing in tx-details (#441)kumavis2016-07-141-0/+1
| | | | | | * new tx - calculate estimatedGas and show thing in tx-details * Bump changelog
* Fix eth balance tooltip to show 6 decimals (#440)Frankie2016-07-141-0/+1
| | | | | | | | | | | | * Fix tooltip to show to the 6 decimal place on balances ovr 0... * Change font size for balance component in tx-list so it fits the notation * Add to change log * Linting * change log
* Bump provider-engine from 7.8.1 to 7.8.3 (#435)Kevin Serrano2016-07-141-0/+2
| | | | | | * Bump provider-engine from 7.8.1 to 7.8.3 * Modify changelog.
* Update changelog.Kevin Serrano2016-07-131-0/+1
|
* Merge branch 'master' into FixSvgIconsDan Finlay2016-07-121-0/+2
|\
| * Merge branch 'master' into balance-refactorKevin Serrano2016-07-121-0/+2
| |\
| * | Update changelog.Kevin Serrano2016-07-121-0/+2
| | |
* | | Fix svg icon in notificationDan Finlay2016-07-121-0/+2
| |/ |/|
* | Version 2.6Dan Finlay2016-07-121-0/+2
|/
* Resolve merge conflict.Kevin Serrano2016-07-081-0/+1
|\
| * Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵kumavis2016-07-081-0/+1
| |\ | | | | | | | | | ConfirmationStyle
| * | Bump changelogDan Finlay2016-07-071-0/+1
| | |
* | | Modify changelog.Kevin Serrano2016-07-081-0/+1
| |/ |/|
* | Add new test state with tx history. Fix alignment issue with transaction ↵Kevin Serrano2016-07-081-0/+1
|/ | | | history text.
* Merge branch 'master' of github.com:MetaMask/metamask-plugin into fastinjectkumavis2016-07-071-0/+1
|\
| * Fix dropdown z-index issue.Kevin Serrano2016-07-071-0/+1
| |
* | changelog - add web3 min distkumavis2016-07-071-0/+1
|/
* Add a postion option for tool tipFrankie2016-07-071-0/+2
|
* Add to changelog.Kevin Serrano2016-07-061-0/+1
|
* Version 2.5.0Dan Finlay2016-07-021-0/+2
|
* Add to CHANGELOGFrankie2016-07-011-0/+1
|
* Bump changelogDan Finlay2016-07-011-0/+1
|
* Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵kumavis2016-06-301-0/+1
|\ | | | | | | networkIndication
| * Merge branch 'master' into CopyTxHashDan Finlay2016-06-301-0/+1
| |\
| * | Bump changelogDan Finlay2016-06-301-0/+2
| | |
* | | Merge branch 'master' into networkIndicationFrankie2016-06-301-0/+4
|\ \ \ | | |/ | |/|
| * | Unify wording for transaction options (#369)Kevin Serrano2016-06-301-0/+2
| |/ | | | | | | | | | | | | | | * Unify wording for transaction options. * Modify changelog. * Fix wording and spacing.
| * Version 2.4.5Dan Finlay2016-06-301-0/+2
| |
* | Add to change logFrankie2016-06-301-0/+2
|/
* Modify network icons to reflect current design. (#355)Kevin Serrano2016-06-291-0/+1
| | | | | | * Modify network icons to reflect current design. * Switch icons around.
* Fix out-of-place positioning of pending tx badges. (#354)Kevin Serrano2016-06-291-0/+1
|
* Merge branch 'master' into pr/351kumavis2016-06-291-1/+2
|\ | | | | | | | | | | # Conflicts: # CHANGELOG.md # app/scripts/lib/notifications.js
| * Merge branch 'master' into FixSomeFormattingkumavis2016-06-291-0/+5
| |\ | | | | | | | | | | | | | | | # Conflicts: # CHANGELOG.md # app/scripts/lib/notifications.js
| * | Fix formatting on terms & conditions pageDan Finlay2016-06-291-0/+1
| | |
* | | Changelog update and reduce allowed characters from 30 to 20.Kevin Serrano2016-06-291-1/+2
| |/ |/|