Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Improve styling in Confirmation Screen; Show decoded send token data | Chi Kei Chan | 2017-09-13 | 1 | -1/+0 |
* | Added signTokenTx; Adding token confirmation screen | Chi Kei Chan | 2017-09-12 | 1 | -0/+3 |
* | Fix html height | Chi Kei Chan | 2017-09-06 | 1 | -2/+2 |
* | Replace Avenir Next with alternative. | Dan | 2017-08-30 | 11 | -0/+93 |
* | Add bolt and info icon vector images | sdtsui | 2017-08-23 | 2 | -0/+22 |
* | Merge remote-tracking branch 'mm/master' into NewUI-flat | sdtsui | 2017-08-14 | 4 | -5/+21 |
|\ | |||||
| * | fix wording | frankiebee | 2017-08-12 | 1 | -1/+1 |
| * | add deprecation warning for web3 | frankiebee | 2017-08-12 | 1 | -1/+4 |
| * | 3.9.6 | kumavis | 2017-08-10 | 1 | -1/+1 |
| * | Merge pull request #1883 from MetaMask/estimateGas-fix | Thomas Huang | 2017-08-10 | 1 | -3/+11 |
| |\ | |||||
| | * | tx utils - detect estimateGas err and set simulationFailed | kumavis | 2017-08-09 | 1 | -3/+11 |
| * | | ui - buy eth - formatting and moved network names to config | kumavis | 2017-08-10 | 1 | -0/+5 |
| |/ | |||||
* | | Merge branch 'master' into NewUI-flat | kumavis | 2017-08-09 | 5 | -189/+253 |
|\| | |||||
| * | tx controller - fix error serialization | kumavis | 2017-08-09 | 1 | -2/+5 |
| * | tx controller - fix getBalance fn | kumavis | 2017-08-09 | 1 | -1/+1 |
| * | util - sufficientBalance - validate input | kumavis | 2017-08-09 | 1 | -1/+6 |
| * | Merge pull request #1880 from MetaMask/pendingFix | Frankie | 2017-08-09 | 2 | -3/+4 |
| |\ | |||||
| | * | filter by network for pending txs | frankiebee | 2017-08-09 | 1 | -0/+2 |
| | * | fix getPendingTransactions function for pendingTxTracker | frankiebee | 2017-08-09 | 2 | -3/+2 |
| * | | Merge branch 'master' into greenkeeper/initial | kumavis | 2017-08-09 | 4 | -186/+241 |
| |\| | |||||
| | * | fix class names | frankiebee | 2017-08-09 | 3 | -18/+25 |
| | * | fix the bind on pending tx watchers | frankiebee | 2017-08-08 | 1 | -3/+3 |
| | * | Merge branch 'master' into transactionControllerRefractor | frankiebee | 2017-08-08 | 4 | -5/+19 |
| | |\ | |||||
| | * | | remove logging of the message and log the error | frankiebee | 2017-08-08 | 1 | -1/+1 |
| | * | | remove unnecessary if statment for error message | frankiebee | 2017-08-08 | 1 | -1/+0 |
| | * | | fix spelling | frankiebee | 2017-08-08 | 2 | -15/+12 |
| | * | | rename PendingTransactionUtils -> PendingTransactionWatchers | frankiebee | 2017-08-05 | 1 | -8/+8 |
| | * | | Merge branch 'master' into transactionControllerRefractor | frankiebee | 2017-08-05 | 12 | -125/+118 |
| | |\ \ | |||||
| | * | | | break out tx status pendding watchers | frankiebee | 2017-08-05 | 2 | -145/+192 |
| | * | | | move util functions to util.js | frankiebee | 2017-08-05 | 2 | -32/+40 |
| | * | | | use error for #approveTransaction when setting failed | frankiebee | 2017-08-03 | 1 | -5/+2 |
| * | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkee... | kumavis | 2017-08-08 | 5 | -6/+21 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Merge branch 'master' into NewUI | kumavis | 2017-08-05 | 2 | -3/+4 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into NewUI | kumavis | 2017-08-04 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into NewUI | kumavis | 2017-08-04 | 4 | -35/+21 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | * | | | | | Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUI | Kevin Serrano | 2017-08-04 | 2 | -2/+15 |
| | |\ \ \ \ \ | |||||
| * | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkee... | kumavis | 2017-08-04 | 15 | -289/+351 |
| * | | | | | | | lint fixes | kumavis | 2017-08-04 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'master' into feat/mm-ui-5 | sdtsui | 2017-08-07 | 13 | -370/+308 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | v3.9.5 | kumavis | 2017-08-05 | 1 | -1/+1 |
| * | | | | | | | blacklist - update phishing on boot and speed up polling to 4 min | kumavis | 2017-08-05 | 1 | -2/+3 |
| | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | v3.9.4 | kumavis | 2017-08-04 | 1 | -1/+1 |
| | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge pull request #1857 from MetaMask/hotFixCancleTx | kumavis | 2017-08-04 | 1 | -1/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | fix cancelTransaction not reciving a callback | frankiebee | 2017-08-04 | 1 | -1/+2 |
| * | | | | | | v3.9.3 | kumavis | 2017-08-04 | 1 | -1/+1 |
| * | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into blacklist-r... | kumavis | 2017-08-04 | 1 | -3/+0 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | remove stack from txs | frankiebee | 2017-08-04 | 1 | -3/+0 |
| | |/ / / / | |||||
| * / / / / | blacklist - use module eth-phishing-detect | kumavis | 2017-08-04 | 2 | -33/+18 |
| |/ / / / | |||||
| * | | | | Merge pull request #1848 from MetaMask/transactionControllerRefractor | kumavis | 2017-08-03 | 4 | -247/+191 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | use async with #publishTransaction | frankiebee | 2017-08-03 | 1 | -2/+2 |
| | * | | | move newUnapprovedTransaction to transactions.js | frankiebee | 2017-08-03 | 4 | -51/+49 |
| | * | | | lint fixes | frankiebee | 2017-08-02 | 3 | -11/+4 |
| | * | | | Merge branch 'master' into transactionControllerRefractor | frankiebee | 2017-08-02 | 8 | -21/+126 |
| | |\ \ \ | |||||
| | * | | | | fix spelling mistake | frankiebee | 2017-08-02 | 1 | -1/+1 |
| | * | | | | fix addTxDefaults | frankiebee | 2017-08-02 | 2 | -2/+3 |
| | * | | | | make addUnapprovedTransaction async function and use promise based ethQuery | frankiebee | 2017-08-02 | 3 | -218/+168 |
| * | | | | | blacklist controller - breakout from metamask and infura controllers | kumavis | 2017-08-03 | 4 | -47/+67 |
| * | | | | | phishing detection - move phishing detection into contentscript and metamask ... | kumavis | 2017-08-03 | 7 | -64/+50 |
| * | | | | | obj-multiplex - missing name error + prefer const over var | kumavis | 2017-08-03 | 1 | -6/+10 |
| | |/ / / | |/| | | | |||||
* | | | | | Add Roboto without hooking it up via import | sdtsui | 2017-08-05 | 18 | -0/+0 |
* | | | | | Adjust sidebar transition using @cjeria\'s feedback | sdtsui | 2017-08-03 | 1 | -0/+10 |
* | | | | | Ensure app-header is rendered in responsive layout | sdtsui | 2017-08-03 | 1 | -1/+1 |
* | | | | | Add Ethereum Logo | sdtsui | 2017-08-03 | 1 | -0/+11 |
* | | | | | Reset popup to 350x500, old form factor as advised by @Zanibas | sdtsui | 2017-08-01 | 1 | -1/+1 |
* | | | | | Add new fonts from @cjeria: DIN Next and DIN OT | sdtsui | 2017-08-01 | 12 | -0/+0 |
* | | | | | Adjust popup size to 545x450; refactor wallet view to fit | sdtsui | 2017-08-01 | 1 | -1/+1 |
* | | | | | Set font-size on body of popup.html, for responsiveness | sdtsui | 2017-07-31 | 1 | -1/+1 |
* | | | | | Adjust dimensions of popup.html and app bar to match | sdtsui | 2017-07-31 | 2 | -2/+2 |
| |_|_|/ |/| | | | |||||
* | | | | Create distinct responsive 'home.html' file, hard-code popup.html size | Dan Finlay | 2017-07-29 | 2 | -1/+13 |
* | | | | Correct viewport param | Dan Finlay | 2017-07-28 | 1 | -1/+1 |
* | | | | Merge branch 'master' into NewUI | Dan Finlay | 2017-07-28 | 6 | -40/+95 |
|\| | | | |||||
| * | | | Do not blacklist files | Dan Finlay | 2017-07-28 | 1 | -1/+0 |
| * | | | Merge branch 'master' into i1805-LiveBlacklistUpdating | Dan Finlay | 2017-07-27 | 2 | -2/+41 |
| |\ \ \ | |||||
| * | | | | Live update blacklist from Infura | Dan Finlay | 2017-07-27 | 4 | -13/+15 |
| * | | | | Merge branch 'master' into i1805-LiveBlacklistUpdating | Dan Finlay | 2017-07-27 | 3 | -7/+13 |
| |\ \ \ \ | |||||
| * | | | | | Begin implementing live-updating blacklist, not working yet | Dan Finlay | 2017-07-27 | 3 | -8/+52 |
* | | | | | | Merge branch 'master' into NewUI | Dan Finlay | 2017-07-28 | 6 | -34/+104 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge pull request #1837 from MetaMask/i1833-levencheck | Dan Finlay | 2017-07-27 | 1 | -8/+36 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Give credit where it is due | Kevin Serrano | 2017-07-27 | 1 | -0/+4 |
| | * | | | | Add levenshtein logic to blacklister. | Kevin Serrano | 2017-07-27 | 1 | -8/+32 |
| * | | | | | Version 3.9.2v3.9.2 | Dan Finlay | 2017-07-27 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | nonce-tracker - hotfix for provider proxying | kumavis | 2017-07-27 | 2 | -5/+11 |
| * | | | | nonce-tracker - add raw baseNonceHex to nonceDetails | kumavis | 2017-07-27 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | tx cont - dont recursively store history | kumavis | 2017-07-27 | 1 | -3/+9 |
| * | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into betterError... | kumavis | 2017-07-27 | 1 | -1/+1 |
| |\| | | |||||
| | * | | Merge branch 'betterErrorsOnTx' of https://github.com/MetaMask/metamask-exten... | frankiebee | 2017-07-26 | 2 | -7/+8 |
| | |\ \ | |||||
| | * | | | fix typo | frankiebee | 2017-07-26 | 1 | -1/+1 |
| * | | | | tx controller + nonce tracker - record nonce components on txMeta | kumavis | 2017-07-27 | 2 | -2/+9 |
| * | | | | nonce-tracker - validation - add validation failing value type to error message | kumavis | 2017-07-27 | 1 | -3/+3 |
| * | | | | nonce-tracker - validation - add validation failing value to error message | kumavis | 2017-07-27 | 1 | -3/+3 |
| | |/ / | |/| | | |||||
| * | | | Merge branch 'master' into betterErrorsOnTx | Frankie | 2017-07-26 | 2 | -7/+8 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | tx cont - add argument for provider constructor | kumavis | 2017-07-26 | 1 | -2/+3 |
| | * | | tx cont - remove old cb from async fn | kumavis | 2017-07-26 | 1 | -5/+5 |
| * | | | fix stack wording | frankiebee | 2017-07-26 | 1 | -2/+2 |
| * | | | use clone | frankiebee | 2017-07-26 | 1 | -1/+1 |
| * | | | remove line numbers | frankiebee | 2017-07-26 | 1 | -3/+3 |
| * | | | Add stack traces both in errors and as a way to track txMetas | frankiebee | 2017-07-26 | 2 | -8/+30 |
| |/ / | |||||
* | | | Disable user zoom in mobile mode | Dan Finlay | 2017-07-28 | 1 | -1/+1 |
* | | | Fix viewport width to 1 | Dan Finlay | 2017-07-28 | 1 | -1/+1 |
* | | | Adjust mobile scale for smaller devices | Dan Finlay | 2017-07-27 | 1 | -1/+1 |
* | | | Set initial scale for mobile. | Dan Finlay | 2017-07-27 | 1 | -1/+2 |
* | | | Replace ui with responsive-ui | Dan Finlay | 2017-07-25 | 3 | -95/+0 |
* | | | Merge branch 'master' into NewUI | Dan Finlay | 2017-07-21 | 12 | -156/+364 |
|\| | | |||||
| * | | Version 3.9.1v3.9.1 | Dan Finlay | 2017-07-20 | 1 | -1/+1 |
| |/ | |||||
| * | transactions - block nonce-tracker while updating pending transactions | kumavis | 2017-07-19 | 2 | -14/+32 |
| * | nonce-tracker - fix lock mechanism to be a real mutex | kumavis | 2017-07-19 | 1 | -11/+15 |
| * | transaction - promisify _checkPendingTxs | kumavis | 2017-07-19 | 1 | -27/+41 |
| * | nonce-tracker - return nonce as integer | kumavis | 2017-07-19 | 1 | -1/+1 |
| * | nonce-tracker - validate nonce calc components | kumavis | 2017-07-19 | 1 | -3/+9 |
| * | turn off auto faucet and remove file | frankiebee | 2017-07-18 | 2 | -24/+0 |
| * | Infura Network response tests | tmashuang | 2017-07-15 | 1 | -0/+1 |
| * | Merge pull request #1617 from MetaMask/nonce-tracker | Frankie | 2017-07-14 | 5 | -96/+149 |
| |\ | |||||
| | * | make publishTransaction and signTransaction async methods | frankiebee | 2017-07-14 | 2 | -21/+19 |
| | * | Merge branch 'master' into nonce-tracker | frankiebee | 2017-07-13 | 2 | -2/+2 |
| | |\ | |||||
| | * | | Fix test to match behavior | frankiebee | 2017-07-13 | 1 | -1/+1 |
| | * | | mv updateAndApproveTx to txController | frankiebee | 2017-07-13 | 1 | -3/+7 |
| | * | | use new nodeify | frankiebee | 2017-07-13 | 2 | -44/+21 |
| | * | | Use txParams | frankiebee | 2017-07-12 | 1 | -4/+4 |
| | * | | Merge branch 'master' into nonce-tracker | frankiebee | 2017-07-12 | 5 | -21/+68 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'nonce-tracker' of https://github.com/MetaMask/metamask-plugin i... | frankiebee | 2017-07-12 | 6 | -26/+121 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch 'master' into nonce-tracker | kumavis | 2017-07-08 | 6 | -26/+121 |
| | | |\ \ \ | |||||
| | * | | | | | remove irrelevan code | frankiebee | 2017-07-12 | 1 | -1/+0 |
| | |/ / / / | |||||
| | * | | | | clean up unused code from old noncelock | frankiebee | 2017-07-06 | 1 | -2/+0 |
| | * | | | | fix nonce calculation order | frankiebee | 2017-07-06 | 1 | -6/+7 |
| | * | | | | nonce-tracker: only check transactions that are not supposed to be ignored | frankiebee | 2017-06-28 | 2 | -7/+15 |
| | * | | | | calculate nonce based on local pending txs w/o error state. | frankiebee | 2017-06-28 | 1 | -1/+10 |
| | * | | | | Merge branch 'master' into nonce-tracker | frankiebee | 2017-06-28 | 5 | -2/+67 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into nonce-tracker | frankiebee | 2017-06-22 | 1 | -1/+3 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | fix nonceTracker | frankiebee | 2017-06-22 | 2 | -46/+19 |
| | * | | | | | | add a test for #getNonceLock | frankiebee | 2017-06-22 | 1 | -6/+16 |
| | * | | | | | | Merge branch 'master' into nonce-tracker | frankiebee | 2017-06-17 | 2 | -36/+74 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | transaction controller - use nonce-tracker | kumavis | 2017-06-15 | 2 | -33/+59 |
| | * | | | | | | | introduce nonce-tracker | kumavis | 2017-06-15 | 1 | -0/+49 |
| * | | | | | | | | Redirect from malicious sites faster | Dan Finlay | 2017-07-14 | 1 | -1/+1 |
| * | | | | | | | | Merge pull request #1771 from MetaMask/addNonceErrToErrLIst | kumavis | 2017-07-13 | 3 | -0/+42 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | limit the range for retryCount | frankiebee | 2017-07-13 | 1 | -1/+1 |
| | * | | | | | | | | write a migration for resubmit tx's to get put back into a submitted state | frankiebee | 2017-07-13 | 2 | -0/+41 |
| | * | | | | | | | | add "nonce too low" to the ignored errs list for tx retrys | frankiebee | 2017-07-13 | 1 | -0/+1 |
| | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | Remove css referencev3.9.0 | Dan Finlay | 2017-07-13 | 1 | -2/+1 |
| * | | | | | | | | Version 3.9.0 | Dan Finlay | 2017-07-13 | 1 | -1/+1 |
| * | | | | | | | | Merge branch 'master' into Version-3.8.6 | Dan Finlay | 2017-07-13 | 2 | -0/+19 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Add first version of phishing site warning | Dan Finlay | 2017-07-13 | 2 | -0/+19 |
| | |/ / / / / / / | |||||
| * / / / / / / / | Version 3.8.6v3.8.6 | Dan Finlay | 2017-07-12 | 1 | -1/+1 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'master' into 3.8.5 | Dan Finlay | 2017-07-12 | 5 | -21/+68 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | metamask - on rpc err show whole error body | kumavis | 2017-07-12 | 1 | -1/+1 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | Merge pull request #1762 from MetaMask/ImproveRetryLogic | kumavis | 2017-07-12 | 2 | -12/+10 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Improve insufficient balance checking in retry loop | Dan Finlay | 2017-07-12 | 2 | -4/+10 |
| | | * | | | | | | Remove local nonce error setting. | Dan Finlay | 2017-07-12 | 1 | -8/+0 |
| | * | | | | | | | use .includes | frankiebee | 2017-07-12 | 1 | -3/+3 |
| | * | | | | | | | add "Gateway timeout" to ignored errors when resubmiting and use .includes ov... | frankiebee | 2017-07-12 | 1 | -1/+3 |
| | |/ / / / / / | |||||
| | * | | | | | | migration 16 - move resubmit warning back to submitted state | kumavis | 2017-07-08 | 2 | -0/+42 |
| | * | | | | | | tx controller - resubmit - correctly set error on bad nonce/balance | kumavis | 2017-07-08 | 1 | -2/+2 |
| | * | | | | | | tx controller - correctly set error message on resubmit error | kumavis | 2017-07-08 | 1 | -4/+8 |
| | * | | | | | | tx controller - resubmit - recognize parity known hash message | kumavis | 2017-07-08 | 1 | -0/+1 |
| * | | | | | | | 3.8.5 | kumavis | 2017-07-08 | 1 | -1/+1 |
| |/ / / / / / | |||||
| * | | | | / | Version 3.8.4v3.8.4 | Dan Finlay | 2017-07-08 | 1 | -1/+1 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | fail transactions that fail in resubmit | frankiebee | 2017-07-07 | 1 | -25/+22 |
| * | | | | | tx controller - clean code | kumavis | 2017-07-07 | 1 | -13/+14 |
| * | | | | | tx controller - move comments | kumavis | 2017-07-07 | 1 | -3/+7 |
| * | | | | | add comment | frankiebee | 2017-07-07 | 1 | -5/+11 |
| * | | | | | if an error happens during a tx publication set tx status to fail | frankiebee | 2017-07-07 | 1 | -1/+10 |
| * | | | | | Version 3.8.3v3.8.3 | Dan Finlay | 2017-07-07 | 1 | -1/+1 |
| * | | | | | Fix failing test | Dan Finlay | 2017-07-06 | 1 | -12/+6 |
| * | | | | | Fail pending txs with low balance or invalid nonce | Dan Finlay | 2017-07-06 | 1 | -4/+22 |
* | | | | | | Move responsive ui into its own folder for easier merges | Dan Finlay | 2017-07-21 | 4 | -4/+4 |
* | | | | | | Merge branch 'master' into NewUI | Dan Finlay | 2017-07-06 | 2 | -3/+10 |
|\| | | | | | |||||
| * | | | | | metamask - append dapp origin domain to rpc request | kumavis | 2017-07-05 | 1 | -2/+9 |
| * | | | | | Version 3.8.2v3.8.2 | Dan Finlay | 2017-07-04 | 1 | -1/+1 |
* | | | | | | Get duplicate UI template working | Dan Finlay | 2017-07-04 | 2 | -6/+3 |
* | | | | | | Make folder for responsive UI | Dan Finlay | 2017-07-04 | 4 | -3/+57 |
* | | | | | | Began creating new UI template | Dan Finlay | 2017-07-04 | 3 | -1/+46 |
|/ / / / / | |||||
* | | | | | Version 3.8.1v3.8.1 | Dan Finlay | 2017-07-01 | 1 | -1/+1 |
* | | | | | Version 3.8.0v3.8.0 | Dan Finlay | 2017-06-29 | 1 | -1/+1 |
* | | | | | Merge pull request #1620 from MetaMask/i1616-AddTokenAdding | Thomas Huang | 2017-06-29 | 2 | -4/+26 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into i1616-AddTokenAdding | Dan Finlay | 2017-06-23 | 1 | -1/+3 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'AddTokenList' into i1616-AddTokenAdding | Dan Finlay | 2017-06-20 | 2 | -36/+74 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Add ability to add tokens to token list | Dan Finlay | 2017-06-16 | 2 | -4/+26 |
* | | | | | | | | Merge pull request #1509 from MetaMask/i1473-dappDefaultGasPrice | Dan Finlay | 2017-06-28 | 1 | -7/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into i1473-dappDefaultGasPrice | Thomas Huang | 2017-06-28 | 6 | -4/+70 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | Keeps dapp gas price if set | Thomas Huang | 2017-06-20 | 1 | -7/+9 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #1685 from MetaMask/setFailed | Dan Finlay | 2017-06-28 | 2 | -0/+39 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Create a migration for setting tx's with the message 'Gave up submitting tx.'... | frankiebee | 2017-06-28 | 2 | -0/+39 |
| | |/ / / / / / | |/| | | | | | | |||||
* / | | | | | | | dont stop retrying brodcasting txs | frankiebee | 2017-06-28 | 1 | -4/+0 |
|/ / / / / / / | |||||
* | | | | | | | Fix error message for invalid seed words. | Kevin Serrano | 2017-06-27 | 1 | -1/+1 |
* | | | | | | | Merge pull request #1663 from MetaMask/infura-status | Thomas Huang | 2017-06-27 | 2 | -1/+56 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | Add infura network status to our UI state. | Kevin Serrano | 2017-06-23 | 1 | -1/+1 |
| * | | | | | | Add infura network status to our UI state. | Kevin Serrano | 2017-06-23 | 2 | -1/+56 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #1603 from MetaMask/AddTokenList | Kevin Serrano | 2017-06-23 | 3 | -1/+10 |
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTo... | Kevin Serrano | 2017-06-20 | 3 | -1/+10 |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | |||||
| | * | | Merge remote-tracking branch 'origin/master' into AddTokenList | Dan Finlay | 2017-06-16 | 1 | -10/+5 |
| | |\| | |||||
| | * | | Refresh token balance on network change | Dan Finlay | 2017-06-15 | 1 | -1/+0 |
| | * | | Persist selected account tab | Dan Finlay | 2017-06-15 | 2 | -0/+9 |
| | * | | Merge branch 'master' into AddTokenList | Dan Finlay | 2017-06-13 | 42 | -379/+552 |
| | |\ \ | |||||
| | * | | | Add missing tx manager state | Dan Finlay | 2017-04-25 | 1 | -0/+1 |
* | | | | | Fix badge number to include personal_sign | Kevin Serrano | 2017-06-21 | 1 | -1/+3 |
|/ / / / | |||||
* | | | | Merge branch 'master' into i1567-FixInaccurateError | Frankie | 2017-06-17 | 1 | -3/+2 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #1623 from MetaMask/checkTxs | Frankie | 2017-06-17 | 1 | -3/+2 |
| |\ \ \ \ | |||||
| | * | | | | put the block listeners back on the provider | frankiebee | 2017-06-17 | 1 | -3/+2 |
* | | | | | | put event back on the "blockTracker:/provider" | frankiebee | 2017-06-17 | 1 | -1/+1 |
* | | | | | | Merge branch 'master' into i1567-FixInaccurateError | frankiebee | 2017-06-17 | 1 | -1/+5 |
|\| | | | | | |||||
| * | | | | | Debounce background updates | Dan Finlay | 2017-06-16 | 1 | -1/+5 |
| |/ / / / | |||||
* | | | | | Merge branch 'master' into i1567-FixInaccurateError | frankiebee | 2017-06-16 | 1 | -16/+52 |
|\| | | | | |||||
| * | | | | Merge pull request #1611 from MetaMask/checkTxsOnSync | kumavis | 2017-06-16 | 1 | -0/+46 |
| |\ \ \ \ | |||||
| | * | | | | transactions controller - add comments | kumavis | 2017-06-16 | 1 | -0/+5 |
| | * | | | | add a check for weather a tx is included in a block when jumping blocks | frankiebee | 2017-06-15 | 1 | -0/+41 |
| | | |_|/ | | |/| | | |||||
| * / | | | check for the tx in the block that provider engine gives us | frankiebee | 2017-06-15 | 1 | -15/+5 |
| |/ / / | |||||
* | | | | check nonce and balance when resubmiting tx | frankiebee | 2017-06-16 | 2 | -11/+17 |
* | | | | remove unnecessary log | frankiebee | 2017-06-15 | 1 | -4/+1 |
* | | | | Do not mark slowly mined txs as failed. | Dan Finlay | 2017-06-15 | 1 | -8/+4 |
|/ / / | |||||
* | | | Merge pull request #1598 from MetaMask/txRetry | Dan Finlay | 2017-06-14 | 1 | -9/+4 |
|\ \ \ | |||||
| * | | | rename continuallyResubmitPendingTxs to resubmitPendingTxs | frankiebee | 2017-06-14 | 1 | -2/+2 |
| * | | | put tx resubmission on the block event | frankiebee | 2017-06-13 | 1 | -8/+3 |
* | | | | Fix networkState in chain id | Thomas Huang | 2017-06-13 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Version 3.7.8v3.7.8 | Dan Finlay | 2017-06-13 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1208 from MetaMask/i#1203MainNetSwitch | kumavis | 2017-06-13 | 1 | -2/+5 |
|\ \ | |||||
| * | | default testnet - fix typo | kumavis | 2017-06-13 | 1 | -1/+0 |
| * | | Merge branch 'master' into i#1203MainNetSwitch | kumavis | 2017-06-13 | 54 | -1182/+929 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into i#1203MainNetSwitch | Frankie | 2017-03-17 | 3 | -1/+97 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into i#1203MainNetSwitch | kumavis | 2017-03-15 | 3 | -3/+3 |
| |\ \ \ \ | |||||
| * | | | | | Swithch the default network to mainnet | frankiebee | 2017-03-14 | 1 | -3/+6 |
* | | | | | | Linting | Thomas Huang | 2017-06-13 | 2 | -3/+3 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge branch 'master' into currency-fix | Dan Finlay | 2017-06-13 | 3 | -10/+3 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into gasupdater | Dan Finlay | 2017-06-13 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | 3.7.7 | kumavis | 2017-06-09 | 1 | -1/+1 |
| * | | | | | | Update gasblocklimit params with every block. | Kevin Serrano | 2017-06-03 | 2 | -9/+2 |
* | | | | | | | Merge branch 'master' into currency-fix | Kevin Serrano | 2017-06-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Version 3.7.6v3.7.6 | Dan Finlay | 2017-06-06 | 1 | -1/+1 |
| * | | | | | | Version 3.7.5 | Dan Finlay | 2017-06-06 | 1 | -1/+1 |
| |/ / / / / | |||||
* / / / / / | Use new URL for currency API from cryptonator. | Kevin Serrano | 2017-06-06 | 2 | -2/+2 |
|/ / / / / | |||||
* | | | | | Version 3.7.4v3.7.4 | Dan Finlay | 2017-06-03 | 1 | -1/+1 |
* | | | | | Merge pull request #1533 from MetaMask/i1528-gasLimitLow | kumavis | 2017-06-03 | 1 | -2/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Convert gasLimit to not use muln in BN | Kevin Serrano | 2017-06-02 | 1 | -2/+8 |
* | | | | | | Version 3.7.3v3.7.3 | Dan Finlay | 2017-06-02 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Version 3.7.2v3.7.2 | Dan Finlay | 2017-06-01 | 1 | -1/+1 |
* | | | | | Merge pull request #1500 from MetaMask/RemoveStreamingSubprovider | Thomas Huang | 2017-05-26 | 1 | -17/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Remove stream subprovider | Dan Finlay | 2017-05-26 | 1 | -17/+5 |
* | | | | | | fix spelling | frankiebee | 2017-05-25 | 1 | -2/+2 |
* | | | | | | Merge branch 'master' into reloadDapp | frankiebee | 2017-05-25 | 2 | -2/+14 |
|\| | | | | | |||||
| * | | | | | Merge pull request #1494 from MetaMask/1472-gasceiling | Dan Finlay | 2017-05-25 | 1 | -1/+12 |
| |\ \ \ \ \ | |||||
| | * | | | | | Add new blockGasLimit property to txMeta object. | Kevin Serrano | 2017-05-25 | 1 | -1/+12 |
| * | | | | | | inpage-provider - disable polling after first block | kumavis | 2017-05-25 | 1 | -1/+2 |
| |/ / / / / | |||||
* / / / / / | Reload the page when switching networks for sites that use web3 | frankiebee | 2017-05-25 | 3 | -41/+28 |
|/ / / / / | |||||
* | | | | | Merge pull request #1487 from MetaMask/stopPolling | kumavis | 2017-05-25 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | stop polling when switching networks | frankiebee | 2017-05-24 | 1 | -0/+1 |
* | | | | | | Merge branch 'master' into Version-3.7.1 | kumavis | 2017-05-24 | 9 | -125/+297 |
|\| | | | | | |||||
| * | | | | | Merge branch 'master' into networkController | Frankie | 2017-05-24 | 3 | -10/+73 |
| |\ \ \ \ \ | |||||
| | * | | | | | Version 3.7.0v3.7.0 | Dan Finlay | 2017-05-24 | 1 | -1/+1 |
| | * | | | | | Cleanup | Dan Finlay | 2017-05-24 | 1 | -2/+3 |
| | * | | | | | Continually resubmit pending txs | Dan Finlay | 2017-05-24 | 1 | -2/+52 |
| | * | | | | | clean - remove console logs | kumavis | 2017-05-23 | 1 | -2/+0 |