1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-10-22 19:26:13 +02:00
Commit Graph

592 Commits

Author SHA1 Message Date
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
Dan Finlay
18cf635735 Fix github link on info page 2016-10-31 09:30:55 -07:00
Dan Finlay
ab055e3f63 Merge branch 'master' into UpdateWeb3 2016-10-26 11:56:04 -07:00
Dan Finlay
b8acdfcab5 Version 2.13.6 2016-10-26 11:48:42 -07:00
Dan Finlay
1d1c64cf89 Merge branch 'master' into UpdateWeb3 2016-10-26 11:44:28 -07:00
Dan Finlay
0bf139188e Merge branch 'master' into i762-RenameWalletToAccount 2016-10-26 11:38:09 -07:00
Dan Finlay
c834b4f637 Merge branch 'master' into i762-RenameWalletToAccount 2016-10-26 11:31:08 -07:00
Dan Finlay
f1bbaeea50 Merge branch 'master' into 761-FixCustomMordenIndication 2016-10-26 10:51:07 -07:00
Dan Finlay
b3613232a2 Rename wallet to account
Fixes #762
2016-10-25 16:54:43 -07:00
Dan Finlay
9b8c970706 Update web3.js version 2016-10-25 16:43:56 -07:00
Dan Finlay
bda64ab132 Fix delegate call analysis
Fixed reference allowing transactions to be analyzed for delegate call again.
2016-10-25 14:58:04 -07:00
Dan Finlay
f2497c5a97 Bump changelog 2016-10-25 14:17:15 -07:00
Frankie
7140c04ef9 Fix CHANGELOG 2016-10-19 15:26:19 -07:00
Frankie
2f7ce1ca4c Merge branch 'master' into i#741 2016-10-19 15:25:27 -07:00
Frankie
4366f72fe1 Add unit test for isHex and add to CHANGELOG.md 2016-10-19 15:22:56 -07:00
Dan Finlay
f31fef034f Fix changelog date 2016-10-18 14:07:47 -07:00
Dan Finlay
70f3d24e90 Version 2.13.5 2016-10-18 14:00:33 -07:00
Dan Finlay
cc23158bfe Wait for first metamask data to establish ping-pong stream.
Prevents infinite reload loops when dapps take too long to load.

Fixes #746.
2016-10-18 13:51:50 -07:00
Dan Finlay
91f43fa213 Increase gas estimate by 100000 wei
To prevent minor gas estimation errors, probably usually related to operating on dynamic state.

Fixes #738.
2016-10-17 12:47:37 -07:00
Dan Finlay
5864044538 Version 2.13.4 2016-10-17 10:37:23 -07:00
Kevin Serrano
bc6092e111
Merge branch 'master' into i735-xmlfix 2016-10-17 10:25:00 -07:00
Kevin Serrano
91a8977d27
Bump changelog. 2016-10-15 15:33:55 -07:00
Frankie
229d95956b Merge branch 'master' into i#495CustomGasField 2016-10-11 16:19:13 -07:00
Dan Finlay
5d01d50c16 Merge branch 'master' into i721-ScrollAccountList 2016-10-11 16:13:53 -07:00
Dan Finlay
e1ece0f0e3 Bump changelog 2016-10-11 16:00:31 -07:00
Frankie
97970e803d Add to CHANGELOG 2016-10-10 18:19:45 -07:00
Kevin Serrano
89780bd22a
Modify changelog. 2016-10-07 02:11:14 -07:00
Kevin Serrano
671b54ff71
Merge branch 'master' into tos 2016-10-05 19:53:41 -07:00
kumavis
ea4946ab3a Merge branch 'master' of github.com:MetaMask/metamask-plugin into Version-2.13.3 2016-10-05 07:22:51 -07:00
Kevin Serrano
40baf0b7de
Add to changelog. 2016-10-04 21:49:06 -07:00
Dan Finlay
6ee22e6688 Version 2.13.3
Bumps provider-engine to fix log query filtering bug.
2016-10-04 16:11:52 -07:00
Frankie
4eafb7da2f Merge branch 'master' into SmallerCopiedButton 2016-10-04 13:50:16 -07:00
Dan Finlay
769bd8e2ee Removed hex prefix from private key export
For compatibility with Jaxx, MEW, and Geth.

Fixes #687
2016-10-04 13:26:51 -07:00
Dan Finlay
55364b6ee3 Bump changelog 2016-10-04 13:13:58 -07:00
Dan Finlay
c7d10affd5 Make seed word confirmation button font smaller
To avoid formatting glitches on some machines.
2016-10-04 13:04:54 -07:00
Dan Finlay
8ef7521675 Version 2.13.2 2016-10-04 11:58:31 -07:00
Dan Finlay
da611eb3a1 Improve popup behavior for parity errors
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.
2016-10-03 20:04:44 -07:00
Frankie
f28de37a8c Add to CHANGELOG 2016-10-01 09:38:53 +08:00
Dan Finlay
b6bbe2d7e8 Version 2.13.1 2016-09-23 10:45:28 +08:00
Dan Finlay
47a334e542 Merge branch 'master' into i675-LoadingBuy 2016-09-22 14:29:02 +08:00
Dan Finlay
9d5cdbcbe6 Version 2.13.0 2016-09-19 22:58:10 +08:00
Dan Finlay
e197e3808f Drop origin key from requests for Parity compatibility 2016-09-19 10:16:27 +08:00
Dan Finlay
ed51b91b4a Merge branch 'master' into i675-LoadingBuy 2016-09-15 21:05:24 -07:00
Dan Finlay
4eef2c57cf Show loading indication when selecting ShapeShift 2016-09-15 20:58:18 -07:00
Frankie
77ef71448d Fix CHANGELOG.md and restructure onClick events 2016-09-15 19:35:04 -07:00
Frankie
dcda841f4d Merge branch 'master' into tx-viz 2016-09-15 18:16:41 -07:00
Frankie
bc33c88ae5 Add to CHANGELOG.md 2016-09-15 18:16:15 -07:00
kumavis
7293c67f68 bump changelog 2016-09-15 13:22:05 -07:00
Dan Finlay
8df005153b
Version 2.12.1 2016-09-14 15:51:50 -07:00
Frankie
034742a571 Merge branch 'master' into i#626 2016-09-14 12:42:35 -07:00
Frankie
17481ff61a Add to CHANGELOG.md 2016-09-14 11:36:56 -07:00
Dan Finlay
03094091d1 Version 2.11.2 2016-09-14 11:35:50 -07:00
Dan Finlay
b624155e60 Merge branch 'i646-ClosePopupBug' of github.com:MetaMask/metamask-plugin into i646-ClosePopupBug 2016-09-13 13:00:29 -07:00
Dan Finlay
3da0d61417 Bump changelog 2016-09-13 12:54:30 -07:00
Frankie
19c1b1fd8e Merge branch 'master' into qrCode 2016-09-13 12:18:19 -07:00
Dan Finlay
b508541935 Fix cache clearing reference for Opera
For some reason Chrome didn't mind this awful bug, but Opera caught it.
2016-09-12 22:13:52 -07:00
Frankie
fc292627e4 Merge branch 'master' into qrCode 2016-09-12 17:30:54 -07:00
Frankie
09bd35ac7a Add to CHANGELOG.md 2016-09-12 17:29:54 -07:00
Dan Finlay
ebf86f930a Version 2.11.0 2016-09-12 15:45:32 -07:00
Frankie
c37c050c8a Revert "Add new eth-lightwallet salting to vault." 2016-09-12 10:34:06 -07:00
Dan Finlay
03168c6b91 Bump changelog 2016-09-09 19:52:37 -07:00
Kevin Serrano
5e38f48f41 Update changelog 2016-09-09 14:24:16 -07:00
Kevin Serrano
2ede90eee3 Merge branch 'i610-InitOneWalletOnly' of github.com:MetaMask/metamask-plugin into i610-InitOneWalletOnly 2016-09-09 09:50:45 -07:00
Dan Finlay
7b6c018c39 Show loading indication during unlocking. 2016-09-08 19:53:54 -07:00
Dan Finlay
2f98d5bc0f Bump changelog 2016-09-08 19:50:55 -07:00
Frankie
3f64095eed Merge branch 'i#589pendingTxsIssue' of https://github.com/MetaMask/metamask-plugin into i#589pendingTxsIssue 2016-09-08 14:56:19 -07:00
Frankie
ece1ecb90b Fix wording in changelog and bug 2016-09-08 14:53:49 -07:00
Frankie
079c1a8972 Merge branch 'master' into i#589pendingTxsIssue 2016-09-08 13:45:27 -07:00
Frankie
7d8491de10 Add to CHANGELOG.md and Remove unnecessary catch 2016-09-08 13:13:43 -07:00
Dan Finlay
a1e9b951ac Bump changelog 2016-09-08 12:51:14 -07:00
Dan Finlay
2ca58f5bf7 Merge branch 'master' into ModularFiatBalance 2016-09-06 19:36:40 -07:00
Dan Finlay
2564c0c51c Bump changelog 2016-09-06 18:59:47 -07:00
Dan Finlay
e75a1d63f7 Bump changelog 2016-09-06 17:31:24 -07:00
Kevin Serrano
01618a88aa Update changelog and merge master. 2016-09-06 15:30:30 -07:00
Kevin Serrano
41632114c0 Add to changelog. 2016-09-06 10:25:14 -07:00
Kevin Serrano
831ed15777 Merge branch 'master' into livereload 2016-09-02 14:16:13 -07:00
Kevin Serrano
068bd7d40a Merge branch 'master' into livereload 2016-09-02 14:15:24 -07:00
Kevin Serrano
f9f821e726 Changelog add. 2016-09-02 14:15:15 -07:00
Kevin Serrano
2d0077d5c6 Changelog add and rename vars. 2016-09-02 14:15:00 -07:00
kumavis
c2a1b442e9 Version 2.10.2 2016-09-02 13:51:22 -07:00
kumavis
8b37bcf16b Version 2.10.1 2016-09-02 12:48:50 -07:00
Dan Finlay
a6e3357d22 Bump changelog 2016-09-01 11:33:54 -07:00
Dan Finlay
e39513ff18 Bump changelog 2016-08-29 12:37:38 -07:00
Dan Finlay
bb8241f711 Version 2.10.0 2016-08-29 11:14:18 -07:00
Frankie
547894ed39 Merge branch 'master' into i#563forgotPassword 2016-08-25 16:06:54 -07:00
Dan Finlay
8b81009a30 Merge branch 'master' into PopupNotifications 2016-08-25 15:42:35 -07:00
Dan Finlay
ca4127dd5e Bump changelog 2016-08-25 15:27:19 -07:00
Frankie
11c6c63d76 Merge branch 'master' into i#563forgotPassword 2016-08-25 14:17:29 -07:00
Frankie
df824c0c45 Add to CHANGELOG 2016-08-25 14:16:57 -07:00
Kevin Serrano
a9b390c58c Bump versioning. 2016-08-24 18:38:15 -07:00
Dan Finlay
793ad6b8d8 Merge branch 'master' into PopupNotifications 2016-08-24 16:59:22 -07:00
Dan Finlay
340d12f0cf Version 2.9.1 2016-08-24 16:32:15 -07:00
Dan Finlay
eee08457e5 Merge branch 'master' into i484PersistPendingSignatures 2016-08-24 16:15:43 -07:00
Kevin Serrano
06b5e7f527 Merge branch 'master' into api-test-fix 2016-08-24 16:09:51 -07:00
Dan Finlay
15c8680e21 Bump changelog 2016-08-24 16:02:47 -07:00
Dan Finlay
6041d6157a Bump changelog 2016-08-24 15:43:42 -07:00
Dan Finlay
4e34796983 Merge branch 'master' into PopupNotifications 2016-08-24 15:03:09 -07:00
Kevin Serrano
e42b35398b Changelog change. 2016-08-24 13:28:31 -07:00
Kevin Serrano
c27ad468d1 Clarify shortcut. 2016-08-24 11:24:46 -07:00
Kevin Serrano
cf5b8ba388 Change shortcut again to Ctrl+Alt+M 2016-08-24 11:15:03 -07:00
Kevin Serrano
1444f5451f Change shortcut to Alt+M 2016-08-24 10:25:59 -07:00
Kevin Serrano
2a9b271703 Update changelog. 2016-08-23 16:54:25 -07:00
Dan Finlay
bc43e3d140 Merge branch 'master' into PopupNotifications 2016-08-23 16:02:06 -07:00
Kevin Serrano
4bceda37a8 Merge branch 'master' into fox-sub 2016-08-23 14:51:09 -07:00
Kevin Serrano
050d0aecc6 Changelog. 2016-08-23 14:32:47 -07:00
Dan Finlay
49ab51d825 Merge branch 'master' into PopupNotifications 2016-08-22 20:06:59 -07:00
Dan Finlay
642e84da6c Merge master 2016-08-22 15:04:13 -07:00
Dan Finlay
6e1000f361 Merge branch 'master' into PopupNotifications 2016-08-22 15:03:36 -07:00
Dan Finlay
f57cbe59fc Removed view more button, added account info button.
Also:
- Also fixed bug that caused React warning when rendering the tx history.
- Renamed 'Transactions' to 'History', since it now has more than that.
2016-08-22 14:36:21 -07:00
Dan Finlay
3d451ddf3e Merge branch 'master' into i390-TransactionLimit 2016-08-22 11:59:08 -07:00
Dan Finlay
31e0a3491b Version 2.9.0 2016-08-22 11:24:34 -07:00
Dan Finlay
8592ffd855 Merge branch 'master' into i390-TransactionLimit 2016-08-19 07:57:35 -07:00
Dan Finlay
9cd85aea2f Merge branch 'master' into shapeshiftTx 2016-08-19 07:50:57 -07:00
Frankie
e3e5538ddc Remove "+" from shapeshift tx and change wording in CHANGELOG 2016-08-18 20:24:17 -07:00
Frankie
98dab0ffd2 Make ballance teal for shapeshift tx and add to change log 2016-08-18 16:30:13 -07:00
Dan Finlay
bd9d89826c Added view more button to transaction list
Visible at the end of the transaction list, or if no transactions are listed, displayed right after the `No Transactions` message.
2016-08-18 16:23:12 -07:00
Kevin Serrano
d53b056425 Bump changelog. 2016-08-18 16:04:51 -07:00
Dan Finlay
270dbacbc4 Bump changelog 2016-08-16 17:52:38 -07:00
Kevin Serrano
7d40f29993 Add to changelog. 2016-08-16 14:13:18 -07:00
Dan Finlay
e5f2c1a866 Version 2.8.0 2016-08-15 10:56:01 -07:00
Dan Finlay
e826eb932c Remove ethereum classic provider
Fixes #542
2016-08-14 18:41:05 -07:00
Frankie
31d6d5c509 Add to change log 2016-08-13 13:48:49 -07:00
kumavis
7dcb3c64df changelog - add note about web3-provider-stream fix 2016-08-11 14:42:02 -07:00
Kevin Serrano
f42723c903 Add to changelog. 2016-08-04 11:24:25 -07:00
Dan Finlay
3a489baa71 Bump changelog 2016-07-29 13:28:10 -07:00
Dan Finlay
019581bd1f Version 2.7.2 2016-07-29 13:08:57 -07:00
Dan Finlay
6151339840 Merge branch 'master' into AddEthClassic 2016-07-28 15:47:22 -07:00
Dan Finlay
5ceed48db9 Fix broken reference to host store.didUpdate
I'd returned this line because it seemed to fix Firefox compatibility, now it seems like that wasn't the case.  Removing it again.
2016-07-28 11:53:33 -07:00
Dan Finlay
5d83b9176b Bump changelog 2016-07-28 10:54:25 -07:00
Dan Finlay
43784e2143 Version 2.7.1 2016-07-27 16:49:11 -07:00