Commit Graph

621 Commits

Author SHA1 Message Date
Dan Finlay f6cc6c6271 Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButton 2017-06-19 19:04:16 -07:00
Dan Finlay 41d992cca9 Merge branch 'AddTokenList' into i1616-AddTokenAdding 2017-06-19 19:03:49 -07:00
Dan Finlay 60855b0510 Add send button to TokenFactory
A simple solution to a temporary token send screen: Linking to EtherScan.

Will hold us over until we make our own token send view.
2017-06-19 19:02:13 -07:00
Kevin Serrano 9da243f42d
Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTokenList 2017-06-19 13:51:38 -07:00
Dan Finlay 48789f2a3d Add ability to add tokens to token list
Fiex #1616
2017-06-15 16:22:53 -07:00
Dan Finlay 39c7ed230d Merge remote-tracking branch 'origin/master' into AddTokenList 2017-06-15 13:44:58 -07:00
Dan Finlay 0fd32e67d4 Do not mark slowly mined txs as failed.
Fixes #1567

Also seems to fix #1556

Also improves resubmit performance by only resubmitting on `latest`.
2017-06-14 12:01:45 -07:00
Kevin Serrano 74d15f5cb0
Bump changelog. 2017-06-14 10:13:34 -07:00
Dan Finlay 5c9a228848 Add token list note to changelog 2017-06-13 17:57:18 -07:00
Kevin Serrano 141e66171b Merge pull request #1600 from MetaMask/i1554-ensSymFix
ENS symbol renders on proper networks
2017-06-13 14:31:58 -07:00
Kevin Serrano e9e43637df
Bump changelog. 2017-06-12 16:57:31 -07:00
Dan Finlay 844159cb18 Version 3.7.8 2017-06-12 15:57:01 -07:00
Frankie 3da887e56e Merge branch 'master' into qrPrefix 2017-06-12 15:09:53 -07:00
frankiebee b712e7ce64 add to CHANGELOG 2017-06-12 14:48:55 -07:00
kumavis 27220b7bcd Merge branch 'master' into i#1203MainNetSwitch 2017-06-12 13:27:04 -07:00
Dan Finlay ba254d9041 Merge branch 'master' into currency-fix 2017-06-12 10:32:54 -07:00
Dan Finlay 3e1d648ec0 Merge branch 'master' into gasupdater 2017-06-12 10:26:40 -07:00
Dan Finlay e9c693eae4 Version bump changelog 2017-06-08 16:44:11 -07:00
kumavis f994461763 changelog - note on block-tracker warp 2017-06-08 16:21:16 -07:00
Kevin Serrano f788ba7244
Resolve changelog merging. 2017-06-05 16:27:15 -07:00
Kevin Serrano deb882bd6e
Merge branch 'master' into currency-fix 2017-06-05 16:26:49 -07:00
Kevin Serrano 0fb38632be
Bump changelog. 2017-06-05 16:25:02 -07:00
Dan Finlay 838ffb62ee Version 3.7.6 2017-06-05 15:36:18 -07:00
Dan Finlay c8f0802a8e Fix bug that prevented publishing contracts 2017-06-05 15:35:52 -07:00
Dan Finlay c92afef91d Version 3.7.5 2017-06-05 13:40:26 -07:00
Kevin Serrano 8d8eb0d8ad
bump changelog 2017-06-02 15:20:41 -07:00
Dan Finlay 611cb7ad93 Version 3.7.4 2017-06-02 11:08:59 -07:00
Dan Finlay d59021f754 Version 3.7.3 2017-06-01 10:18:20 -07:00
Dan Finlay 76a78fdb3b Version 3.7.2 2017-05-31 14:06:13 -07:00
Dan Finlay 1203bd15c2 Add names to contract map & conf view 2017-05-26 10:31:42 -07:00
Dan Finlay 7cd42ae9ba Bump changelog 2017-05-26 00:45:58 -07:00
Thomas Huang 8f9a230d8d Merge pull request #1500 from MetaMask/RemoveStreamingSubprovider
Remove streaming subprovider
2017-05-25 15:04:50 -07:00
Dan Finlay 6064161215 Bump changelog 2017-05-25 13:43:53 -07:00
frankiebee a2064bd16e add to CHANGELOG 2017-05-24 23:18:09 -04:00
Kevin Serrano b95f2158bb
bump changelog 2017-05-24 16:23:31 -07:00
Kevin Serrano 10ca3b6467
Fix bug where submit was enabled when invalid params were filled out. 2017-05-24 10:13:43 -07:00
Kevin Serrano 2d739647b9
Bump changelog 2017-05-24 10:01:45 -07:00
Kevin Serrano 45285a5a2f
Merge branch 'master' into i1412-decimalizethegas 2017-05-24 09:55:32 -07:00
Frankie 97ea7454b3 Merge branch 'master' into networkController 2017-05-23 20:36:11 -04:00
frankiebee c1239608a6 add to CHANGELOG 2017-05-23 20:27:51 -04:00
Dan Finlay 17604f1ef5 Version 3.7.0 2017-05-23 14:49:45 -07:00
Dan Finlay 4dab68c48f Merge branch 'master' into i1409-StalledTxs 2017-05-23 12:24:45 -07:00
Dan Finlay cd2ad1733d Continually resubmit pending txs 2017-05-23 12:22:15 -07:00
Kevin Serrano 97d19f0f79
Merge branch 'master' into i1412-decimalizethegas 2017-05-23 10:43:59 -07:00
Dan Finlay be5af7cb4b Throw if ENS Resolver isn't set up
Instead of resolving to name owners, which can encourage inconsistent usage of ENS.

Fixes #1427.
2017-05-22 17:45:29 -07:00
kumavis 99f28527a3 Merge branch 'master' into HelpDebugStalledTxs 2017-05-22 16:21:24 -07:00
Dan Finlay 39f9ffa18a Bump changelog 2017-05-22 15:25:31 -07:00
Dan Finlay 3c90024564 Label the pending tx icon with a tooltip 2017-05-21 14:15:34 -07:00
Dan Finlay 6209224a6c Add transaction number (nonce) to tx list 2017-05-21 14:09:44 -07:00
Dan Finlay 2a25f99461 Version 3.6.5 2017-05-17 14:36:50 -07:00
Dan Finlay 24737ded34 Fix bug where decimals in gas inputs gave strange results 2017-05-17 14:13:05 -07:00
Kevin Serrano 1358966202
Merge branch 'master' into i1412-decimalizethegas 2017-05-17 10:42:15 -07:00
Dan Finlay 31c7daee73 Fix bug where edited gas parameters did not take effect
Fixes #1407
2017-05-16 23:33:40 -07:00
Kevin Serrano 90bfa3cbcd
Fix merge conflicts. 2017-05-16 16:28:57 -07:00
Kevin Serrano 44f25cd93c
Changelog bump 2017-05-16 16:21:50 -07:00
kumavis b904fa5d86 changelog - add note on filter fix 2017-05-15 17:13:13 -07:00
Kevin Serrano d389d0efd6
Bump changelog 2017-05-11 12:31:08 -07:00
Dan Finlay 3ed7205b75 Version 3.6.4 2017-05-09 17:08:33 -07:00
Dan Finlay ff1a1284cc Version 3.6.3 2017-05-08 22:05:38 -07:00
Dan Finlay 662a646fa9 Version 3.6.2 2017-05-08 16:20:37 -07:00
Kevin Serrano f131f59c82
Changelog bump 2017-05-08 16:03:28 -07:00
Dan Finlay e921f7f13a Add changelog entry for 1390 2017-05-08 13:32:45 -07:00
Dan Finlay d7a2d29e6c fix block polling changelog note 2017-05-08 12:04:57 -07:00
Dan Finlay 17accd3a20 Bump changelog 2017-05-07 16:53:14 -07:00
Dan Finlay a09dca68a4 Fix changelog formatting 2017-05-07 16:44:23 -07:00
Kevin Serrano 0ceaf2be83 Merge branch 'master' into flyswatter-patch-1 2017-05-01 09:01:25 -07:00
Dan Finlay 791c8fccf8 Bump changelog 2017-04-30 18:56:11 -07:00
Dan Finlay c3481f0eb1 Correct change dates 2017-04-30 13:33:05 -07:00
Dan Finlay 7ddbd1a193 Version 3.6.1 2017-04-30 12:39:17 -07:00
kumavis a21339dd85 Update CHANGELOG.md 2017-04-28 16:10:26 -07:00
Dan Finlay 6d1fe7845c Version 3.6.0
t # Explicit paths specified without -i or -o; assuming --only paths...
2017-04-27 15:11:14 -07:00
Dan Finlay a9a39bdf8f Merge branch 'master' into Version-3.5.4 2017-04-27 15:10:16 -07:00
Kevin Serrano b0919ba729
Add to changelog. 2017-04-25 14:57:35 -07:00
Dan Finlay f1beb0720a Version 3.5.4 2017-04-25 10:59:43 -07:00
Dan Finlay 04e489f4df Allow signature V values over 1 byte
By bumping ethereumjs-tx.
2017-04-25 10:20:49 -07:00
Dan Finlay 3ae2a82995 Bump provider engine
Should now pass test suite, and include several sweet recent fixes!
2017-04-24 18:49:23 -07:00
Dan Finlay c3746e62ec Version 3.5.3 2017-04-24 13:58:46 -07:00
Kevin Serrano ddbbc645d3
Changelog. 2017-04-05 13:39:49 -07:00
Dan Finlay daf22168b6 Bump changelog 2017-03-29 10:42:02 -07:00
Dan Finlay 3b6b06db92 Version 2.5.2 2017-03-28 15:01:01 -07:00
Dan Finlay a3e08d779e Merge branch 'master' into kovan-faucet-instructions 2017-03-28 14:50:55 -07:00
Dan Finlay 3a1f1b3bc4 Bump changelog 2017-03-27 17:43:15 -07:00
Kevin Serrano 67892c49a6 Merge branch 'master' into kovan-faucet-instructions 2017-03-27 16:45:04 -04:00
Dan Finlay d41c8ef598 Version 3.5.1 2017-03-27 13:39:19 -07:00
Kevin Serrano c69ebf3420
Add to changelog. 2017-03-27 16:33:54 -04:00
Kevin Serrano 6fd7e133bd
Add to changelog. 2017-03-27 16:06:05 -04:00
Dan Finlay d9c2f4f5e8 Version 3.5.0 2017-03-27 11:48:10 -07:00
Kevin Serrano 30e8d25013
Merge branch 'master' into i1210-txdisappearance 2017-03-24 17:13:57 -04:00
Kevin Serrano 2e446eb588
Add to changelog. 2017-03-23 11:28:52 -04:00
Dan Finlay 86f9be06eb Merge branch 'master' into i1234-HardGasLimits-BrowserForm 2017-03-22 16:00:11 -07:00
Kevin Serrano 457611d8f8 Merge branch 'master' into i1234-HardGasLimits-BrowserForm 2017-03-22 15:41:47 -07:00
Dan Finlay 72e979909c Merge branch 'master' into i238-kovan 2017-03-22 15:37:33 -07:00
Dan Finlay de0d9af066 Bump changelog 2017-03-22 15:30:49 -07:00
Kevin Serrano 1c7e04db4a
Changelog bump. 2017-03-22 16:06:48 -04:00
kumavis 9ac2ce1744 Merge branch 'master' into i1033-spinnerfix 2017-03-22 09:57:15 -07:00
frankiebee 2ffd42f9f0 Add to CHANGELOG 2017-03-22 09:49:44 -07:00
Kevin Serrano 6e6fa703cc Add to changelog. 2017-03-21 08:57:19 -07:00
Kevin Serrano 10040bee49 Changelog addition. 2017-03-21 06:59:08 -07:00
Dan Finlay b6e2eaf7b1 Remove eth-lightwallet 2017-03-16 11:16:03 -07:00
Frankie 57d1a1f186 Merge branch 'master' into i#1203MainNetSwitch 2017-03-16 11:00:12 -07:00
kumavis c759300d4c Merge branch 'master' into i1165-predictive 2017-03-14 13:11:03 -07:00
Kevin Serrano c136cb6cd4 Add to changelog. 2017-03-14 11:44:54 -07:00
frankiebee 33a70a695b Add to CHANGELOG 2017-03-13 21:15:21 -07:00
Kevin Serrano 7d0bfdf076 Changelog addition. 2017-03-13 16:46:33 -07:00
Dan Finlay ea59125ce1 Bump changelog 2017-03-08 15:48:18 -08:00
Dan Finlay 05346ec3c3 Version 3.4.0 2017-03-08 13:38:55 -08:00
Kevin Serrano 86f71d504c Merge branch 'master' into i1144-moarrpc 2017-03-08 09:28:36 -08:00
Dan Finlay 1f0a4dd033 Bump changelog 2017-03-07 21:30:27 -08:00
Kevin Serrano e66035254f
More conflict resolution. 2017-03-01 10:04:25 -08:00
Kevin Serrano 0a3849ec84
Fix merge conflicts. 2017-03-01 10:01:21 -08:00
Dan Finlay 865764dff5 Bump changelog 2017-02-28 15:46:26 -08:00
Dan Finlay 5edb3db969 Merge branch 'master' into i1144-moarrpc 2017-02-27 10:36:48 -08:00
Dan Finlay c831043a51 Remove claim for ecRecover support 2017-02-27 10:16:16 -08:00
Dan Finlay a35229e8d4 Bump changelog 2017-02-24 16:15:31 -08:00
Kevin Serrano 761eb49586
Changelog. 2017-02-22 15:13:29 -08:00
Dan Finlay 29f07238f4 Move changelog entry 2017-02-21 09:03:16 -08:00
Dan Finlay 04e80d36be Version 3.3.0 2017-02-20 14:46:55 -08:00
Dan Finlay 42a58918d0 Add personal_sign and personal_ecRecover support 2017-02-20 11:46:43 -08:00
Kevin Serrano c12bea5b2e Merge branch 'master' into i1089-networkfront 2017-02-15 15:56:37 -08:00
Dan Finlay 352bb5cb39 Merge branch 'master' into dev 2017-02-15 15:49:04 -08:00
Kevin Serrano 3fe8e2b659 Merge branch 'master' into i1089-networkfront 2017-02-15 15:44:14 -08:00
Kevin Serrano 6a3b93b06e
Changelog. 2017-02-15 15:38:38 -08:00
Kevin Serrano 6ef78eb02b
Add to changelog. 2017-02-15 11:16:35 -08:00
Dan Finlay 0b0eec9c52 Bump changelog 2017-02-13 21:30:08 -08:00
kumavis d1a6b8c8ed Merge branch 'dev' into i1085-synchronousnet 2017-02-09 18:41:01 -08:00
Dan Finlay 26ae3d206f Version 3.2.2 2017-02-09 18:21:11 -08:00
Frankie 26cd66cb62 Add to CHANGELOG 2017-02-09 17:34:05 -08:00
Kevin Serrano 4033b620bd
Allowed net_version to be called synchronously 2017-02-08 15:51:22 -08:00
Dan Finlay 5d827bece3 Version 3.2.1 2017-02-08 13:12:40 -08:00
Dan Finlay 480c7c5d24 Version 3.2.0 2017-02-07 16:11:30 -08:00
Frankie e2e8a7cca0 Add to CHANGELOG 2017-02-01 11:55:26 -08:00
kumavis 70b8e640f0 Merge branch 'dev' into i#1048 2017-01-24 15:39:33 -08:00
kumavis e2b2e6d5e1 3.1.2 2017-01-24 14:04:29 -08:00
Frankie 42bb90341d add to CHANGELOG 2017-01-24 13:21:15 -08:00
Frankie c587d0f7db Merge branch 'master' into upToDate 2017-01-20 14:40:22 -08:00
kumavis 389a104f0d 3.1.1 2017-01-20 14:29:07 -08:00
Dan Finlay b478ce5b77 Bump changelog 2017-01-18 17:24:41 -08:00
Dan Finlay 0e01abdf71 Merge branch 'master' into Version-3.1.0 2017-01-18 12:25:35 -08:00
Dan Finlay 99ce68b4f6 Version 3.1.0 2017-01-18 12:23:48 -08:00
kumavis 3273f507f7 Merge branch 'dev' into i715-AddImportMenu 2017-01-18 12:15:43 -08:00
Frankie 9e58505942 Add to CHANGELOG 2017-01-18 12:10:49 -08:00
Dan Finlay 81a16fb107 Bump changelog 2017-01-18 11:48:34 -08:00
Dan Finlay 8055113e68 Bump changelog 2017-01-17 16:35:57 -08:00
Dan Finlay a208ed1d83 Version 3.0.1 2017-01-17 00:14:25 -08:00
Dan Finlay 665d6c5406 Bump changelog 2017-01-16 23:58:25 -08:00
Dan Finlay 9203b8c305 Version 3.0.0 2017-01-16 14:14:06 -08:00
Dan Finlay ac6a2b4b61 Bump changelog to mention BIP44 fix 2017-01-16 10:59:01 -08:00
Dan Finlay 5dd5619e5d Merge branch 'master' into dev 2017-01-16 10:55:32 -08:00
Frankie 83468cbd03 add to CHANGELOG 2017-01-14 23:12:53 -08:00
Frankie bbd2f2738b Add to CHANGELOG 2017-01-11 12:23:00 -08:00
kumavis a9bdc76e40 changelog - add note on rpc overrides 2017-01-11 00:48:06 -08:00
Dan Finlay 55a55754d0 Bump changelog 2017-01-10 14:20:51 -08:00
Frankie efde16aae5 add to CHANGELOG 2017-01-10 12:19:02 -08:00
Kevin Serrano 4e62ae98bd Merge branch 'dev' into network-indicator-refactor 2017-01-05 12:51:12 -08:00
Dan Finlay 73ee0ae766 Merge branch 'dev' into fixTxManager 2017-01-05 11:18:13 -08:00
Kevin Serrano b9a365a8f2
Changelog. 2017-01-04 15:08:39 -08:00
Dan Finlay 0fab22082a Bump changelog 2017-01-04 14:02:13 -08:00
Frankie f50e983500 Merge branch 'TxManager' of https://github.com/MetaMask/metamask-plugin into TxManager 2017-01-04 13:53:54 -08:00
Kevin Serrano 3363a38bfc
Changelog. 2017-01-03 11:26:19 -08:00
Kevin Serrano 68e27e6193
Changelog. 2017-01-03 11:24:03 -08:00
Dan Finlay d2fb48f8ba Bump changelog 2017-01-02 14:41:04 -08:00
Frankie 6f7c23fd28 Merge branch 'dev' into TxManager 2016-12-21 14:31:07 -08:00
Kevin Serrano 9110547465
Add to changelog. 2016-12-20 16:45:30 -08:00
Frankie 05e62cbc17 make CHANGELOG more human readable 2016-12-20 14:11:00 -08:00
Frances Pangilinan 10d9cf0912 Add to CHANGELOG.md 2016-12-20 13:52:51 -08:00
Dan Finlay 35d8f69e80 Merge pull request #942 from MetaMask/Version-2.14.1
Version 2.14.1
2016-12-20 11:48:15 -08:00
Dan Finlay 3f2945dce0 Version 2.14.1 2016-12-20 08:58:18 -08:00
Dan Finlay ead8329877 Merge pull request #937 from MetaMask/i900-forgot-password-flow
I900 forgot password flow
2016-12-19 16:01:01 -08:00
Kevin Serrano 92ddcba76b
Add to changelog. 2016-12-19 14:56:27 -08:00
Dan Finlay 77d2deb176 Merged master into dev 2016-12-19 13:37:27 -08:00
kumavis e1d6a1ea94 changelog - add whitespace 2016-12-19 13:24:38 -08:00
kumavis 5ea7d738d2 changelog - inf reload detection hotfix 2016-12-19 13:23:32 -08:00
kumavis 6f8370fce8 changelog - add note on inf reload detection hotfix 2016-12-19 13:22:02 -08:00
Kevin Serrano 8819475a2e Add ability to show notices to user & get confirmation.
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.
2016-12-16 10:44:52 -08:00
Dan Finlay 4f3ba6e0b8 Bump changelog for removing morden 2016-12-15 16:12:03 -08:00
Frances Pangilinan 5a292cc397 add to CHANGELOG.md 2016-12-14 13:03:40 -08:00
kumavis 84ff919f73 deps - bump provider-engine for bug fix 2016-12-12 16:09:52 -08:00
kumavis 3632173afa changelog - "fix reload detection" 2016-12-07 14:59:20 -08:00
Dan Finlay 44a2f2ad9d Version 2.13.11 2016-11-23 16:59:48 -08:00
Dan Finlay b899119582 Merge branch 'master' into dev 2016-11-23 16:54:27 -08:00
kumavis 36c824889f changelog - add sync rpc eth_uninstallFilter note 2016-11-23 11:00:48 -08:00
Dan Finlay d9f8a8f9b2 Version 2.13.10 2016-11-22 14:51:33 -08:00
Kevin Serrano 6dad4f1f20
Phase out ethereumjs-util from encryptor module. 2016-11-22 11:17:05 -08:00
Dan Finlay cffe0c27f3 Merge branch 'master' into new-faucet 2016-11-22 10:31:29 -08:00
Kevin Serrano 17669e4af8
Make ropsten faucet button point at the correct url. 2016-11-22 10:20:59 -08:00
Kevin Serrano 88ed1f191f
Add to changelog. 2016-11-22 09:45:28 -08:00
Dan Finlay aefc346a65 Bump changelog 2016-11-21 19:14:22 -08:00
Dan Finlay 1ddc7625e0 Version 2.13.9 2016-11-21 12:24:27 -08:00
Kevin Serrano 7cf6e372eb Merge pull request #837 from MetaMask/FixMenuItem
Fix custom provider menu item
2016-11-21 12:19:54 -08:00
Dan Finlay 6ae2400ef2 Fix custom provider menu item
The Custom RPC menu item in the provider menu would not appear when Localhost:8545 was selected.
2016-11-21 11:45:31 -08:00
Dan Finlay e8a8302624 Begin adding Ropsten support
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
2016-11-21 10:58:49 -08:00
Dan Finlay 8eb91e89bf Increment tx ids to avoid collisions
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.
2016-11-17 14:05:12 -08:00
Dan Finlay a4eadddd6b Version 2.13.8 2016-11-16 16:00:32 -08:00
Kevin Serrano 205205f7cd
Add to changelog. 2016-11-14 11:19:58 -08:00
kumavis 1d0abc4771 changelog - update 2016-11-10 21:26:10 -08:00
Kevin Serrano b6b4be61d9
Fix bug for increasing gas by 20 percent. 2016-11-09 16:29:24 -08:00
Dan Finlay 4a0197012e Version 2.13.7 2016-11-08 08:51:14 -08:00
Dan Finlay 7068d2e71c Adjust gas buffer to be 20% over estimate 2016-11-08 08:39:41 -08:00
Dan Finlay 6f39924e60 Increase gas buffer
Fixes #795
2016-11-08 08:32:34 -08:00
Dan Finlay 1896928562 Fix gas price buffering
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.
2016-11-07 11:56:20 -08:00