Dan Finlay
31c1839ed7
Fix initial gas price estimate
2017-03-23 15:11:52 -07:00
Dan Finlay
612bace17d
Prevent default for reset and reject buttons
2017-03-23 15:01:05 -07:00
Dan Finlay
bda821f144
Override browser default validation message
2017-03-23 14:57:35 -07:00
Dan Finlay
55e8a717e6
Fix some broken refs
2017-03-23 14:55:59 -07:00
Dan Finlay
6b100163e9
Merge branch 'i1234-HardGasLimits-BrowserForm' of github.com:MetaMask/metamask-plugin into i1234-HardGasLimits-BrowserForm
2017-03-23 13:46:09 -07:00
Dan Finlay
e7a3330b98
Combine pending-tx-details component into pending-tx-details
...
These were only separated originally so we could make the notification-based TX approval work, which provided its own buttons.
This two templates are logically highly coupled, and keeping them working while separate has been difficult at times, and has even required resorting to dubious practices, like using React's `refs` pattern.
This combines them into one fairly large component, but I think it's ok, we can still break this up into components, just not the separation that it had previously.
2017-03-23 13:44:09 -07:00
Kevin Serrano
b8500d384b
Merge branch 'master' into i1234-HardGasLimits-BrowserForm
2017-03-23 12:05:42 -07:00
Dan Finlay
f29a116d40
Merge pull request #1251 from MetaMask/kovan-tx-etherscan
...
Enable etherscan linking on Kovan transaction list items.
2017-03-23 08:42:02 -07:00
Kevin Serrano
525c32ae60
Enable etherscan linking on Kovan transaction list items.
2017-03-23 11:26:39 -04:00
Dan Finlay
86f9be06eb
Merge branch 'master' into i1234-HardGasLimits-BrowserForm
2017-03-22 16:00:11 -07:00
Dan Finlay
b9714b881a
Merge pull request #1243 from MetaMask/i238-kovan
...
Add Kovan Test Net
2017-03-22 15:58:53 -07:00
Dan Finlay
af9d782363
Merge branch 'master' into i238-kovan
2017-03-22 15:55:01 -07:00
Dan Finlay
205161c489
Merge pull request #1241 from MetaMask/i1237-xmlfix2
...
Modify logic for injection conditions.
2017-03-22 15:54:52 -07:00
Kevin Serrano
45cdf6bdea
Merge branch 'master' into i238-kovan
2017-03-22 15:51:52 -07:00
Kevin Serrano
90d5dc636e
Merge branch 'master' into i1237-xmlfix2
2017-03-22 15:51:15 -07:00
Kevin Serrano
d82549a1ea
Merge pull request #1247 from MetaMask/hide-password
...
Hide the password in the private key retrieval screen.
2017-03-22 15:50:43 -07:00
Kevin Serrano
c55c768cde
Merge branch 'master' into hide-password
2017-03-22 15:46:50 -07:00
Dan Finlay
76e7d6fbb1
Merge branch 'master' into i1237-xmlfix2
2017-03-22 15:43:26 -07:00
Dan Finlay
5e40ed1ee9
Merge pull request #1245 from MetaMask/i1193-errorstylefix
...
Fix styling of error message in import accounts
2017-03-22 15:43:14 -07:00
Kevin Serrano
457611d8f8
Merge branch 'master' into i1234-HardGasLimits-BrowserForm
2017-03-22 15:41:47 -07:00
Kevin Serrano
16bdfd3d6e
Merge branch 'master' into i238-kovan
2017-03-22 15:41:38 -07:00
Kevin Serrano
463eb01d1d
Merge branch 'master' into hide-password
2017-03-22 15:41:24 -07:00
Kevin Serrano
2687b8604b
Merge branch 'master' into i1237-xmlfix2
2017-03-22 15:39:30 -07:00
Dan Finlay
9545ef3ba8
Merge branch 'master' into i1193-errorstylefix
2017-03-22 15:39:20 -07:00
Dan Finlay
5b81f7120b
Merge pull request #1244 from MetaMask/i1227-uidumpblockhash
...
Add current block number and hash to the state.
2017-03-22 15:38:54 -07:00
Dan Finlay
bb971baf81
Merge branch 'master' into i1237-xmlfix2
2017-03-22 15:37:44 -07:00
Dan Finlay
72e979909c
Merge branch 'master' into i238-kovan
2017-03-22 15:37:33 -07:00
Dan Finlay
7e6445110a
Merge branch 'master' into i1227-uidumpblockhash
2017-03-22 15:34:23 -07:00
Dan Finlay
33ba38df6e
Merge pull request #1225 from MetaMask/i1033-spinnerfix
...
Fix spinner issue on seed word request
2017-03-22 15:32:39 -07:00
Dan Finlay
de0d9af066
Bump changelog
2017-03-22 15:30:49 -07:00
Dan Finlay
18414f5cbd
Merge branch 'master' into i1234-HardGasLimits-BrowserForm
2017-03-22 15:25:15 -07:00
Dan Finlay
77907038ff
Got basic validations working
2017-03-22 15:17:57 -07:00
Kevin Serrano
41e276b036
Hide the password in the private key retrieval screen.
2017-03-22 17:46:51 -04:00
Kevin Serrano
5d14925842
Fix styling of error message.
2017-03-22 16:54:10 -04:00
Kevin Serrano
1b7326048d
Add current block number and hash to the state.
2017-03-22 16:41:19 -04:00
Kevin Serrano
1c7e04db4a
Changelog bump.
2017-03-22 16:06:48 -04:00
Kevin Serrano
b26c53452e
Add Kovan test network to our application.
2017-03-22 16:05:04 -04:00
Kevin Serrano
34f3889eb0
Add kovan to drop-menu-item
2017-03-22 16:04:28 -04:00
Kevin Serrano
4757858df0
Add conditional kovan to current network component.
2017-03-22 16:03:51 -04:00
Kevin Serrano
b3dfc4e639
Add kovan conditional to config screen.
2017-03-22 16:03:02 -04:00
Kevin Serrano
c00544de91
Add conditional kovan logic to etherscan link generators.
2017-03-22 16:02:17 -04:00
Kevin Serrano
4116b37d32
Modify css rule for unused hollow diamond.
2017-03-22 16:01:38 -04:00
Kevin Serrano
33dd7954a7
Add kovan config settings to config manager.
2017-03-22 16:00:50 -04:00
Kevin Serrano
c5f96be98d
Add kovan to config file.
2017-03-22 15:59:46 -04:00
Kevin Serrano
b5b88392b9
Merge branch 'master' into i1237-xmlfix2
2017-03-22 11:33:56 -07:00
Kevin Serrano
9906da86a4
Modify logic for injection conditions.
2017-03-22 14:25:56 -04:00
Dan Finlay
9f1f0bff1e
Some progress
2017-03-22 10:35:02 -07:00
kumavis
9ac2ce1744
Merge branch 'master' into i1033-spinnerfix
2017-03-22 09:57:15 -07:00
kumavis
864f8b06f9
Merge pull request #1239 from MetaMask/betterErrors
...
Better errors
2017-03-22 09:55:47 -07:00
frankiebee
2ffd42f9f0
Add to CHANGELOG
2017-03-22 09:49:44 -07:00
