Kevin Serrano
14e6b92e29
Resolve merge conflicts.
8 years ago
Kevin Serrano
1db0bc4b2a
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault
8 years ago
Kevin Serrano
a4666de0ce
Minimize repeated code.
8 years ago
Kevin Serrano
b1fee2a1d3
Minimize repeated code.
8 years ago
kumavis
68d5b459ed
Merge pull request #811 from MetaMask/deadly-fix
...
Fix error display in confirmation screen
8 years ago
Kevin Serrano
7de6b12aad
Re-enable disclaimer screen. Rename variables to reflect role more clearly.
8 years ago
Kevin Serrano
92edc63d6e
Add idStore tests again.
8 years ago
Kevin Serrano
acf02c9290
Merge branch 'deadly-fix' of github.com:MetaMask/metamask-plugin into deadly-fix
8 years ago
Kevin Serrano
205205f7cd
Add to changelog.
8 years ago
Kevin Serrano
d891869eff
First attempt at fixing errors in confirmation screen.
8 years ago
Kevin Serrano
26a548a7a3
First attempt at fixing errors in confirmation screen.
8 years ago
Kevin Serrano
eea3bfb0b3
Rename n variables to numberOfAccounts inside of test suite. Remove idStore tests.
8 years ago
Kevin Serrano
4826f7c0a0
Revert to previous anonymous function for promise.
8 years ago
Kevin Serrano
20cea5b2f5
Various keyring changes
...
- Rearrange the require statements.
- Remove unused web3.
- Simplify some callbacks and promises.
- Clarify certain parameters.
8 years ago
Kevin Serrano
bfeaae69f2
Clarify functions names. Package normalize inside util file. Fix require headers.
8 years ago
Kevin Serrano
7012747fb5
Package normalize inside sig util file.
8 years ago
Kevin Serrano
0c23925c23
Fix lint rules for ternary operator placement.
8 years ago
Kevin Serrano
3828edf6a4
Typo fix.
8 years ago
Kevin Serrano
23263bec7d
Linting to the max.
8 years ago
kumavis
c664b8f11e
Merge branch 'master' into i328-MultiVault
8 years ago
kumavis
115fdc36fe
Merge pull request #807 from MetaMask/cssIsAwesome
...
Fix funny looking errors in conf-tx
8 years ago
Frankie
b60f51dfc2
lint fix
8 years ago
Frankie
b60992b446
Fix funny looking errors in conf-tx
8 years ago
kumavis
e123e3095b
Merge branch 'master' into i328-MultiVault
8 years ago
kumavis
f88079c6b9
Merge pull request #805 from MetaMask/i804
...
detect tx error - show warning and fix gasLimit
8 years ago
kumavis
1d0abc4771
changelog - update
8 years ago
kumavis
536cab0687
detect tx error - show warning and fix gasLimit
8 years ago
Kevin Serrano
ad290d3edc
Merge pull request #802 from MetaMask/confTxFix
...
Conf tx fix
8 years ago
Frankie
17aac2dbc5
fix tx data so it has the network id
8 years ago
Frankie
f665b779cb
Merge branch 'master' into i328-MultiVault
8 years ago
Kevin Serrano
3775a4bf79
Merge pull request #801 from MetaMask/deadly
...
Properly implement 20% gas bump
8 years ago
Kevin Serrano
e2b2083df0
remove gas field, due to alias redundancy.
8 years ago
Kevin Serrano
b6b4be61d9
Fix bug for increasing gas by 20 percent.
8 years ago
Kevin Serrano
14a833f5c0
Merge branch 'deadly' of github.com:MetaMask/metamask-plugin into deadly
8 years ago
Frankie
ebcdb7a491
Merge pull request #797 from MetaMask/Version-2.13.7
...
Version 2.13.7
8 years ago
Dan Finlay
b57009493b
Hard coding jazzicon at working version
8 years ago
Dan Finlay
4a0197012e
Version 2.13.7
8 years ago
Dan Finlay
2160eb35aa
Merge pull request #796 from MetaMask/IncreaseGasBuffer
...
Increase gas buffer
8 years ago
Dan Finlay
7068d2e71c
Adjust gas buffer to be 20% over estimate
8 years ago
Dan Finlay
6f39924e60
Increase gas buffer
...
Fixes #795
8 years ago
Kevin G. Serrano
7b3f1ecc41
Unify warning functions.
8 years ago
Dan Finlay
161ff62fdc
Merge branch 'master' into i328-MultiVault
8 years ago
Dan Finlay
93c0a6826a
Fix integration test suite
8 years ago
Dan Finlay
798e057854
Fix nickname test
8 years ago
Dan Finlay
7b420c6e15
Fix BN reference
8 years ago
Kevin Serrano
62a15fc59e
Merge pull request #793 from MetaMask/i787-HighGasBug
...
i787 High gas bug
8 years ago
Dan Finlay
553a6da011
Fix 787 gas buffer bug
8 years ago
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.
8 years ago
Dan Finlay
fff5a6765e
Added failing test for #787
8 years ago
Dan Finlay
fc26a0a899
Fix network checking
8 years ago