Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #1977 from MetaMask/Version-3.9.11 | Dan Finlay | 2017-08-24 | 2 | -1/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | Version 3.9.11v3.9.11 | Dan Finlay | 2017-08-24 | 2 | -1/+3 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1973 from MetaMask/hotfix-migration019 | kumavis | 2017-08-24 | 3 | -1/+85 | |
|\ \ \ \ \ | ||||||
| * | | | | | fall back to `latest` if blockNumber is null | frankiebee | 2017-08-24 | 1 | -1/+1 | |
| * | | | | | Make method return a number | Dan Finlay | 2017-08-24 | 1 | -1/+1 | |
| * | | | | | Only cancel pending txs with non continuously high nonces | Dan Finlay | 2017-08-24 | 1 | -1/+24 | |
| * | | | | | fix description | frankiebee | 2017-08-24 | 1 | -2/+2 | |
| * | | | | | hotfix - fail submitted txs whos nonce is out of bound | frankiebee | 2017-08-24 | 2 | -0/+61 | |
* | | | | | | Merge pull request #1971 from MetaMask/SetMaxRetryLimit | kumavis | 2017-08-24 | 3 | -2/+13 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Bump changelog | Dan Finlay | 2017-08-24 | 1 | -0/+1 | |
| * | | | | | Fail transactions after a day of retries | Dan Finlay | 2017-08-24 | 2 | -2/+12 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1969 from MetaMask/i1966-IgnoreInvalidPendingNonces | Dan Finlay | 2017-08-24 | 3 | -38/+89 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Bump changelog | Dan Finlay | 2017-08-24 | 1 | -0/+2 | |
| * | | | | Enforce nonces as type string | Dan Finlay | 2017-08-24 | 1 | -2/+10 | |
| * | | | | Use toNumber method | Dan Finlay | 2017-08-24 | 1 | -2/+1 | |
| * | | | | Fix network nonce parsing | Dan Finlay | 2017-08-24 | 1 | -4/+11 | |
| * | | | | Corrected test constraints | Dan Finlay | 2017-08-24 | 1 | -2/+2 | |
| * | | | | Add mysterious failing test | Dan Finlay | 2017-08-24 | 1 | -0/+20 | |
| * | | | | Pass nonce tests | Dan Finlay | 2017-08-24 | 2 | -12/+11 | |
| * | | | | Got all tests but one passing | Dan Finlay | 2017-08-24 | 1 | -0/+1 | |
| * | | | | Fix new test, break an older maybe wrong one | Dan Finlay | 2017-08-24 | 2 | -29/+27 | |
| * | | | | Linted | Dan Finlay | 2017-08-24 | 1 | -1/+0 | |
| * | | | | Add failing test for newly identified error state | Dan Finlay | 2017-08-24 | 1 | -0/+17 | |
| * | | | | Simplify nonce calculation | Dan Finlay | 2017-08-24 | 1 | -4/+5 | |
|/ / / / | ||||||
* | | | | Merge pull request #1963 from MetaMask/Version-3.9.10v3.9.10 | Dan Finlay | 2017-08-24 | 2 | -1/+3 | |
|\ \ \ \ | ||||||
| * | | | | Version 3.9.10 | Dan Finlay | 2017-08-24 | 2 | -1/+3 | |
|/ / / / | ||||||
* | | | | Merge pull request #1945 from MetaMask/useLocalNonce | Dan Finlay | 2017-08-24 | 5 | -58/+255 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge branch 'master' into useLocalNonce | Dan Finlay | 2017-08-24 | 2 | -10/+2 | |
| |\ \ \ \ | |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #1960 from MetaMask/RemoveTxViz | Kevin Serrano | 2017-08-24 | 2 | -10/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove eth-tx-viz link from tx history icons | Dan Finlay | 2017-08-24 | 2 | -10/+3 | |
|/ / / / / | ||||||
| * | | | | Bump changelog | Dan Finlay | 2017-08-24 | 1 | -0/+2 | |
| * | | | | Merge branch 'master' into useLocalNonce | Dan Finlay | 2017-08-24 | 10 | -27/+3214 | |
| |\ \ \ \ | |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #1946 from MetaMask/Version-3.9.9 | Thomas Huang | 2017-08-19 | 2 | -2/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | Version 3.9.9v3.9.9 | Dan Finlay | 2017-08-19 | 2 | -2/+3 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1914 from MetaMask/history-diff | Dan Finlay | 2017-08-19 | 8 | -26/+3211 | |
|\ \ \ \ \ | ||||||
| * | | | | | clean - remove unused test data | kumavis | 2017-08-15 | 1 | -13634/+0 | |
| * | | | | | migration 18 - activate | kumavis | 2017-08-15 | 1 | -0/+1 | |
| * | | | | | migration 18 - fix an oops | kumavis | 2017-08-15 | 1 | -1/+1 | |
| * | | | | | tx controller - test - fix typo from moved test | kumavis | 2017-08-15 | 1 | -3/+3 | |
| * | | | | | tx controller - tx state history various small fixes | kumavis | 2017-08-15 | 5 | -4/+13637 | |
| * | | | | | tx controller - test - test tx state history in updateTx | kumavis | 2017-08-15 | 1 | -6/+18 | |
| * | | | | | migration 18 - move to diff-based history | kumavis | 2017-08-15 | 1 | -0/+52 | |
| * | | | | | introduce tx-state-history-helper and diff-based history | kumavis | 2017-08-15 | 6 | -20/+3141 | |
| | |_|_|/ | |/| | | | ||||||
| | * | | | Fix format of changelog | Dan Finlay | 2017-08-24 | 1 | -1/+0 | |
| | * | | | nonce-tracker - more debugging numbers for nonceDetails | kumavis | 2017-08-23 | 1 | -10/+8 | |
| | * | | | remove unused code | kumavis | 2017-08-23 | 1 | -15/+0 | |
| | * | | | nonce-tracker - use ethjs-query | kumavis | 2017-08-23 | 1 | -11/+2 | |
| | * | | | nonce-tracker - fix var name | kumavis | 2017-08-23 | 1 | -4/+4 | |
| | * | | | nonce-tracker - getlocalNextNonce - add entry to nonceDetails | kumavis | 2017-08-23 | 1 | -1/+1 | |
| | * | | | nonce-tracker - simplify _getlocalNextNonce | kumavis | 2017-08-23 | 1 | -20/+29 | |
| | * | | | nonce-tracker - simplify getHighestNonce | kumavis | 2017-08-23 | 1 | -5/+3 | |
| | * | | | nonce-tracker - getHighestNonce doesnt need uniqued input | kumavis | 2017-08-23 | 1 | -4/+4 | |
| | * | | | nonce-tracker - make nonce strategy api and naming more symmetical | kumavis | 2017-08-23 | 1 | -19/+21 | |
| | * | | | nonce-tracker - pass tests | frankiebee | 2017-08-22 | 1 | -5/+4 | |
| | * | | | Refer to pending nonces, not just their count | Dan Finlay | 2017-08-22 | 1 | -0/+15 | |
| | * | | | clean up code | frankiebee | 2017-08-22 | 1 | -39/+43 | |
| | * | | | nonce-tracker - pass tests | frankiebee | 2017-08-22 | 1 | -11/+38 | |
| | * | | | fix test | frankiebee | 2017-08-22 | 1 | -9/+9 | |
| | * | | | When network nonce is highest, it should be used. | Dan Finlay | 2017-08-22 | 1 | -4/+15 | |
| | * | | | Fix test | Dan Finlay | 2017-08-22 | 1 | -5/+5 | |
| | * | | | Add new assertions and de-duplicate nonce tracker generation | Dan Finlay | 2017-08-22 | 1 | -29/+73 | |
| | * | | | Add test for no previous txs | Dan Finlay | 2017-08-22 | 1 | -4/+25 | |
| | * | | | Confine mock strategy to describe block | Dan Finlay | 2017-08-22 | 1 | -35/+39 | |
| | * | | | Move mock txs to tx mocking class | Dan Finlay | 2017-08-22 | 2 | -35/+48 | |
| | * | | | break out network nonce calc. | frankiebee | 2017-08-19 | 1 | -17/+21 | |
| | * | | | fix 0x0 nonce calc. | frankiebee | 2017-08-19 | 1 | -8/+18 | |
| | * | | | include pendingTxs in localNonce | frankiebee | 2017-08-19 | 1 | -10/+9 | |
| | * | | | use "localNonce" when the network returns a nonce that is lower then a known ... | frankiebee | 2017-08-19 | 2 | -3/+27 | |
| | * | | | add test for using localNonce | frankiebee | 2017-08-19 | 1 | -4/+42 | |
| |/ / / |/| | | | ||||||
* | | | | Merge pull request #1941 from MetaMask/i1912-TokenPrecisionFix | Kevin Serrano | 2017-08-19 | 2 | -1/+3 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge branch 'master' into i1912-TokenPrecisionFix | Kevin Serrano | 2017-08-19 | 3 | -2/+8 | |
| |\ \ \ \ | |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #1942 from MetaMask/i1903-EthSignFormat | Thomas Huang | 2017-08-18 | 3 | -2/+7 | |
|\ \ \ \ \ | ||||||
| * | | | | | Bump changelog | Dan Finlay | 2017-08-18 | 1 | -0/+2 | |
| * | | | | | Fix eth sign formatting | Dan Finlay | 2017-08-18 | 2 | -2/+5 | |
|/ / / / / | ||||||
| * / / / | Fix token balance precision rendering | Dan Finlay | 2017-08-18 | 2 | -1/+2 | |
|/ / / / | ||||||
* | | | | Merge pull request #1935 from MetaMask/i1091-ShowTxErrors | Frankie | 2017-08-18 | 3 | -104/+8 | |
|\ \ \ \ | ||||||
| * | | | | Remove dead tests | Dan Finlay | 2017-08-17 | 1 | -86/+1 | |
| * | | | | Bump changelog | Dan Finlay | 2017-08-17 | 1 | -0/+2 | |
| * | | | | Transition to home view after tx error | Dan Finlay | 2017-08-17 | 1 | -18/+5 | |
* | | | | | Merge pull request #1933 from MetaMask/Version-3.9.8 | Thomas Huang | 2017-08-17 | 2 | -1/+3 | |
|\| | | | | ||||||
| * | | | | Version 3.9.8v3.9.8 | Dan Finlay | 2017-08-17 | 2 | -1/+3 | |
|/ / / / | ||||||
* | | | | Merge pull request #1928 from MetaMask/RemoveDefaultTokens | Kevin Serrano | 2017-08-17 | 3 | -52/+31 | |
|\ \ \ \ | ||||||
| * | | | | Fallback to ethplorer link | Dan Finlay | 2017-08-17 | 1 | -1/+18 | |
| * | | | | Remove dead code | Dan Finlay | 2017-08-17 | 1 | -14/+0 | |
| * | | | | Bump changelog | Dan Finlay | 2017-08-17 | 1 | -0/+3 | |
| * | | | | Remove default tokens | Dan Finlay | 2017-08-17 | 1 | -11/+1 | |
| * | | | | ReEnable Token List | Dan Finlay | 2017-08-17 | 1 | -26/+9 | |
|/ / / / | ||||||
* | | | | Merge pull request #1921 from MetaMask/v3.9.7 | Kevin Serrano | 2017-08-16 | 2 | -1/+3 | |
|\ \ \ \ | ||||||
| * | | | | v3.9.7 update changelogv3.9.7 | kumavis | 2017-08-16 | 1 | -0/+2 | |
| * | | | | v3.9.7 | kumavis | 2017-08-16 | 1 | -1/+1 | |
* | | | | | Merge pull request #1916 from MetaMask/fix/account-name-scroll | Kevin Serrano | 2017-08-16 | 1 | -1/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Fix overflow issue on QubesOS, flagged by @kumavis | sdtsui | 2017-08-15 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | Merge pull request #1918 from MetaMask/token-hotfix | Kevin Serrano | 2017-08-16 | 2 | -9/+27 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Change cursor type to indicate link. | Kevin Serrano | 2017-08-16 | 1 | -0/+1 | |
| * | | | fix spelling | frankiebee | 2017-08-16 | 1 | -4/+3 | |
| * | | | Add to CHANGELOG | frankiebee | 2017-08-16 | 1 | -0/+1 | |
| * | | | Disable token list | frankiebee | 2017-08-16 | 1 | -9/+26 | |
|/ / / | ||||||
* | | | Merge pull request #1904 from MetaMask/web3-depreciation | kumavis | 2017-08-13 | 2 | -1/+6 | |
|\ \ \ | ||||||
| * | | | fix wording | frankiebee | 2017-08-12 | 1 | -1/+1 | |
| * | | | Add to CHANGELOG | frankiebee | 2017-08-12 | 1 | -0/+2 | |
| * | | | add deprecation warning for web3 | frankiebee | 2017-08-12 | 1 | -1/+4 | |
| |/ / | ||||||
* | | | Merge pull request #1899 from sdtsui/fix/acct-name-lengths | Frankie | 2017-08-12 | 3 | -4/+22 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Cleanup stray logs and lint | sdtsui | 2017-08-11 | 2 | -6/+1 | |
| * | | Add overflow support for all account names in account details | sdtsui | 2017-08-11 | 1 | -2/+11 | |
| * | | Fix logic for dropdown components attaching checkmark to correct account | sdtsui | 2017-08-11 | 1 | -1/+2 | |
| * | | Fix text overflow for dropdown components flagged by @frankiebee | sdtsui | 2017-08-11 | 1 | -1/+14 | |
|/ / | ||||||
* | | Merge pull request #1894 from MetaMask/3.9.6v3.9.6 | Thomas Huang | 2017-08-10 | 2 | -3/+5 | |
|\ \ | ||||||
| * | | 3.9.6 | kumavis | 2017-08-10 | 2 | -3/+5 | |
|/ / | ||||||
* | | Merge pull request #1892 from MetaMask/deps-query | Thomas Huang | 2017-08-10 | 1 | -1/+1 | |
|\ \ | |/ |/| | ||||||
| * | deps - bump ethjs-query | 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 | |
* | | Merge pull request #1885 from MetaMask/dharma | kumavis | 2017-08-10 | 2 | -46/+115 | |
|\ \ | ||||||
| * | | ui - buy eth - formatting and moved network names to config | kumavis | 2017-08-10 | 2 | -23/+24 | |
| * | | lint fix | kumavis | 2017-08-09 | 1 | -1/+1 | |
| * | | ui - buy eth - add dharma beta to kovan | kumavis | 2017-08-09 | 1 | -12/+22 | |
| * | | ui - buy button view - refactor | kumavis | 2017-08-09 | 1 | -46/+104 | |
| |/ | ||||||
* | | Merge pull request #1884 from MetaMask/waffle-badge | Frankie | 2017-08-09 | 1 | -1/+2 | |
|\ \ | |/ |/| | ||||||
| * | readme - add waffle.io badge | kumavis | 2017-08-09 | 1 | -1/+2 | |
|/ | ||||||
* | Merge pull request #1882 from MetaMask/tx-cont-fixes | Frankie | 2017-08-09 | 2 | -4/+12 | |
|\ | ||||||
| * | 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 pull request #1879 from MetaMask/build-err-fix | Thomas Huang | 2017-08-09 | 2 | -19/+28 | |
|\ \ | ||||||
| * | | build - factor watcify into bundler generation | kumavis | 2017-08-09 | 1 | -17/+11 | |
| * | | build - fix error swallowing on dev | kumavis | 2017-08-09 | 1 | -1/+16 | |
| * | | deps - bump watchify | kumavis | 2017-08-09 | 1 | -2/+2 | |
|/ / | ||||||
* | | Merge pull request #1854 from MetaMask/greenkeeper/initial | Thomas Huang | 2017-08-09 | 9 | -46/+49 | |
|\ \ | ||||||
| * \ | Merge branch 'master' into greenkeeper/initial | kumavis | 2017-08-09 | 14 | -380/+680 | |
| |\ \ | |/ / |/| | | ||||||
* | | | Merge pull request #1877 from MetaMask/hotfix/mobile-buy-layout | kumavis | 2017-08-09 | 2 | -70/+80 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | Fix layout issues flagged by @tmashuang | sdtsui | 2017-08-09 | 1 | -69/+79 | |
| * | | Make buy ui more central to the screen | sdtsui | 2017-08-09 | 1 | -1/+1 | |
* | | | Merge pull request #1861 from MetaMask/transactionControllerRefractor | kumavis | 2017-08-09 | 12 | -310/+600 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | add json-rpc-engine && eth-json-rpc-middleware to devDependencies | frankiebee | 2017-08-09 | 1 | -0/+2 | |
| * | | fix class names | frankiebee | 2017-08-09 | 3 | -18/+25 | |
| * | | use provider stub | frankiebee | 2017-08-09 | 2 | -88/+65 | |
| * | | create a provider stub | frankiebee | 2017-08-09 | 1 | -0/+25 | |
| * | | fix the bind on pending tx watchers | frankiebee | 2017-08-08 | 1 | -3/+3 | |
| * | | remove .only | frankiebee | 2017-08-08 | 1 | -1/+1 | |
| * | | Merge branch 'master' into transactionControllerRefractor | frankiebee | 2017-08-08 | 36 | -737/+1151 | |
| |\ \ | |/ / |/| | | ||||||
| * | | fix test | frankiebee | 2017-08-08 | 1 | -3/+3 | |
| * | | 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 | 20 | -160/+188 | |
| |\ \ | ||||||
| * | | | fixed: showing tx-s as errors vs. warning | frankiebee | 2017-08-05 | 1 | -3/+12 | |
| * | | | bring your own BN | frankiebee | 2017-08-05 | 1 | -0/+1 | |
| * | | | break out tx status pendding watchers | frankiebee | 2017-08-05 | 2 | -145/+192 | |
| * | | | test for pending tx watcher | frankiebee | 2017-08-05 | 4 | -100/+280 | |
| * | | | test for SufficientBalance | frankiebee | 2017-08-05 | 1 | -0/+41 | |
| * | | | move util functions to util.js | frankiebee | 2017-08-05 | 2 | -32/+40 | |
| * | | | rename the test description Transaction Manger -> Message Manger | frankiebee | 2017-08-05 | 1 | -1/+1 | |
| * | | | use error for #approveTransaction when setting failed | frankiebee | 2017-08-03 | 1 | -5/+2 | |
| | | * | Updated commonjs require path for redux-logger and redux-thunk modules | Thomas Huang | 2017-08-09 | 1 | -2/+2 | |
| | | * | Merge branch 'greenkeeper/initial' of github.com:MetaMask/metamask-extension ... | kumavis | 2017-08-08 | 1 | -2/+2 | |
| | | |\ | ||||||
| | | | * | readme - fix greenkeeper badge position | kumavis | 2017-08-04 | 1 | -2/+2 | |
| | | * | | Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkee... | kumavis | 2017-08-08 | 39 | -744/+1178 | |
| | | |\ \ | |_|_|/ / |/| | | / | | | |/ | ||||||
* | | | | Merge pull request #1835 from MetaMask/NewUI | kumavis | 2017-08-08 | 34 | -732/+1137 | |
|\ \ \ \ | ||||||
| * | | | | Improve readability of changelog | sdtsui | 2017-08-07 | 1 | -9/+9 | |
| * | | | | Merge branch 'master' into NewUI | kumavis | 2017-08-05 | 4 | -4/+9 | |
| |\ \ \ \ | |/ / / / |/| | | | | ||||||
* | | | | | Merge pull request #1866 from MetaMask/v3.9.5v3.9.5 | Frankie | 2017-08-05 | 3 | -2/+6 | |
|\ \ \ \ \ | ||||||
| * | | | | | v3.9.5 | kumavis | 2017-08-05 | 2 | -1/+5 | |
| * | | | | | blacklist - bump phishing detector | kumavis | 2017-08-05 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1865 from MetaMask/blacklist-moar | Frankie | 2017-08-05 | 2 | -3/+4 | |
|\ \ \ \ \ | ||||||
| * | | | | | blacklist - update phishing on boot and speed up polling to 4 min | kumavis | 2017-08-05 | 2 | -3/+4 | |
|/ / / / / | ||||||
| * | | | | Merge pull request #1867 from sdtsui/NewUI | kumavis | 2017-08-05 | 2 | -2/+7 | |
| |\ \ \ \ | ||||||
| | * | | | | Fix integration test failures: ensure qr code is accessible | sdtsui | 2017-08-05 | 1 | -1/+7 | |
| | * | | | | Fix integration test failures: unnecessary sandwich-expando event stopPropaga... | sdtsui | 2017-08-05 | 1 | -1/+0 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #1864 from sdtsui/lint-droppo | kumavis | 2017-08-05 | 1 | -31/+24 | |
| |\ \ \ \ | ||||||
| | * | | | | Lint menu-droppo | sdtsui | 2017-08-05 | 1 | -31/+24 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #1862 from sdtsui/add-rct | kumavis | 2017-08-05 | 5 | -3/+145 | |
| |\ \ \ \ | ||||||
| | * | | | | Bring menu-droppo component into project, remove as a dependency | sdtsui | 2017-08-05 | 3 | -2/+139 | |
| | * | | | | Re-enable css transitions for dropdowns in header, needs menu-droppo library ... | sdtsui | 2017-08-05 | 3 | -1/+6 | |
| * | | | | | Merge pull request #1863 from sdtsui/newui-early-break | kumavis | 2017-08-05 | 1 | -0/+27 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | Cleanup breakpoint css + comment on hackiness | sdtsui | 2017-08-05 | 1 | -11/+14 | |
| | * | | | | Adds early breakpoint from @frankiebee 's + @kumavis 's CR | sdtsui | 2017-08-05 | 1 | -0/+24 | |
| |/ / / / | ||||||
| * | | | | Merge branch 'NewUI' of github.com:MetaMask/metamask-extension into NewUI | kumavis | 2017-08-04 | 2 | -2/+6 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | Merge branch 'master' into NewUI | kumavis | 2017-08-04 | 2 | -2/+6 | |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | ||||||
* | | | | | | Merge pull request #1859 from MetaMask/v3.9.4v3.9.4 | Frankie | 2017-08-04 | 2 | -2/+6 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | ||||||
| * | | | | | v3.9.4 | kumavis | 2017-08-04 | 2 | -2/+6 | |
|/ / / / / | ||||||
| * / / / | test - integration - better error handling | kumavis | 2017-08-04 | 1 | -10/+9 | |
| |/ / / | ||||||
| * | | | test - integration - syntax - prefer const | kumavis | 2017-08-04 | 1 | -12/+7 | |
| * | | | test - integration - remove unused code | kumavis | 2017-08-04 | 1 | -1/+3 | |
| * | | | test - integration - throw error on failure | kumavis | 2017-08-04 | 1 | -2/+2 | |
| * | | | ui - dropdown - use Object.assign syntax to appease coverage parser | kumavis | 2017-08-04 | 1 | -3/+2 | |
| * | | | Merge branch 'master' into NewUI | kumavis | 2017-08-04 | 9 | -44/+50 | |
| |\ \ \ | |/ / / |/| | | | ||||||
* | | | | Merge pull request #1857 from MetaMask/hotFixCancleTx | kumavis | 2017-08-04 | 4 | -8/+25 | |
|\ \ \ \ | ||||||
| * | | | | test - actions - tx - fix async test | kumavis | 2017-08-04 | 1 | -5/+4 | |
| * | | | | test - actions - remove commented code | kumavis | 2017-08-04 | 1 | -2/+0 | |
| * | | | | nodeify - test - syntax nitpick | kumavis | 2017-08-04 | 1 | -3/+3 | |
| * | | | | add test for no callback error | frankiebee | 2017-08-04 | 1 | -0/+11 | |
| * | | | | fix test | frankiebee | 2017-08-04 | 1 | -2/+7 | |
| * | | | | fix cancelTransaction not reciving a callback | frankiebee | 2017-08-04 | 2 | -4/+8 | |
* | | | | | Merge pull request #1856 from MetaMask/v3.9.3 | Frankie | 2017-08-04 | 2 | -1/+4 | |
|\ \ \ \ \ | ||||||
| * | | | | | v3.9.3 | kumavis | 2017-08-04 | 2 | -1/+4 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1855 from MetaMask/blacklist-refactor2v3.9.3 | Kevin Serrano | 2017-08-04 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | deps - bump eth-detect-phishing | kumavis | 2017-08-04 | 1 | -1/+1 | |
| | | * | | | Merge pull request #1858 from sdtsui/NewUI | kumavis | 2017-08-04 | 7 | -31/+120 | |
| | | |\ \ \ | ||||||
| | | | * | | | Adjust padding of accountSwitcher dropdown | sdtsui | 2017-08-04 | 1 | -4/+7 | |
| | | | * | | | Adjust top and bottom padding of accountSwitcher | sdtsui | 2017-08-04 | 1 | -2/+9 | |
| | | | * | | | Lint ui/app | sdtsui | 2017-08-04 | 3 | -14/+11 | |
| | | | * | | | Allow new accounts selector to handle clicks | sdtsui | 2017-08-04 | 1 | -2/+2 | |
| | | | * | | | Increase size of accountSelection dropdown | sdtsui | 2017-08-04 | 1 | -8/+22 | |
| | | | * | | | Increase size of settings dropdown and account settings dropdown | sdtsui | 2017-08-04 | 2 | -2/+2 | |
| | | | * | | | Increase size of network dropdown | sdtsui | 2017-08-04 | 4 | -4/+28 | |
| | | | * | | | De-dupe click handler for sandwich-expando | sdtsui | 2017-08-04 | 1 | -6/+12 | |
| | | | * | | | Add note with previous fa-angle-down for future refactor | sdtsui | 2017-08-04 | 1 | -0/+2 | |
| | | | * | | | Position account switcher icon back in app header | sdtsui | 2017-08-04 | 1 | -2/+6 | |
| | | | * | | | Move accountselector menu-droppo up to app-header | sdtsui | 2017-08-04 | 1 | -0/+22 | |
| | | | * | | | Disable account selection dropdown from account details | sdtsui | 2017-08-04 | 2 | -7/+16 | |
| | | | * | | | Adjust account checksumAddress location up | sdtsui | 2017-08-04 | 1 | -0/+1 | |
| | | * | | | | Fix fox positioning. | Kevin Serrano | 2017-08-04 | 1 | -1/+5 | |
| | | |/ / / | ||||||
| | | * | | | Fix wonky widths for notices. | Kevin Serrano | 2017-08-04 | 2 | -2/+6 | |
| | | * | | | Add maximum width for private key reveal | Kevin Serrano | 2017-08-04 | 1 | -1/+1 | |
| | | * | | | Remove 100% properties that were messing up sizing. | Kevin Serrano | 2017-08-04 | 1 | -2/+0 | |
| | | * | | | Add QR functionality | Kevin Serrano | 2017-08-04 | 1 | -0/+13 | |
| | | * | | | Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUI | Kevin Serrano | 2017-08-04 | 28 | -695/+829 | |
| | | |\ \ \ | ||||||
| | | | * | | | lint fix | kumavis | 2017-08-02 | 2 | -3/+3 | |
| | | | * | | | Merge pull request #1841 from sdtsui/fix/dropdown-toggle | Kevin Serrano | 2017-08-02 | 2 | -4/+32 | |
| | | | |\ \ \ | ||||||
| | | | | * | | | Fix dropdown behavior - network | sdtsui | 2017-07-29 | 1 | -1/+11 | |
| | | | | * | | | Fix dropdown toggle behavior - settings | sdtsui | 2017-07-29 | 1 | -1/+5 | |
| | | | | * | | | Fix dropdown toggle behavior - account dropdowns | sdtsui | 2017-07-29 | 1 | -2/+16 | |
| | | | |/ / / | ||||||
| | | | * | | | 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 | |
| | | | * | | | Fix react warning | Dan Finlay | 2017-07-28 | 1 | -0/+6 | |
| | | | * | | | Limit max width of seed word conf screen | Dan Finlay | 2017-07-28 | 1 | -2/+5 | |
| | | | * | | | Correct token pluralization for one token | Dan Finlay | 2017-07-28 | 1 | -1/+3 | |
| | | | * | | | Bump changelog | Dan Finlay | 2017-07-28 | 1 | -0/+2 | |
| | | | * | | | Merge branch 'master' into NewUI | Dan Finlay | 2017-07-28 | 8 | -46/+104 | |
| | | | |\ \ \ | ||||||
| | | | * \ \ \ | Merge branch 'master' into NewUI | Dan Finlay | 2017-07-28 | 16 | -58/+180 | |
| | | | |\ \ \ \ | ||||||
| | | | * | | | | | Set min gas price to 1 gwei | Dan Finlay | 2017-07-28 | 1 | -1/+1 | |
| | | | * | | | | | 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 | |
| | | | * | | | | | Ensure loading indication is full screen | Dan Finlay | 2017-07-28 | 1 | -0/+1 | |
| | | | * | | | | | Fix loading indication placement | Dan Finlay | 2017-07-28 | 1 | -1/+1 | |
| | | | * | | | | | Remove unused parameter | Dan Finlay | 2017-07-28 | 2 | -2/+2 | |
| | | | * | | | | | Restore support link | Dan Finlay | 2017-07-28 | 1 | -4/+4 | |
| | | | * | | | | | Fix info page formatting | Dan Finlay | 2017-07-28 | 1 | -6/+14 | |
| | | | * | | | | | Fix spelling | Dan Finlay | 2017-07-28 | 1 | -1/+1 | |
| | | | * | | | | | Remove deprecated responsive dev docs | Dan Finlay | 2017-07-28 | 2 | -12/+0 | |
| | | | * | | | | | Bump menu-droppo to 2.0.1 | Dan Finlay | 2017-07-28 | 1 | -1/+1 | |
| | | | * | | | | | Fix custom provider indication | Dan Finlay | 2017-07-27 | 2 | -6/+6 | |
| | | | * | | | | | Remove object spread syntax | Dan Finlay | 2017-07-27 | 1 | -7/+9 | |
| | | | * | | | | | Adjust mobile scale for smaller devices | Dan Finlay | 2017-07-27 | 1 | -1/+1 | |
| | | | * | | | | | Set initial scale for mobile. | Dan Finlay | 2017-07-27 | 3 | -3/+6 | |
| | | | * | | | | | Merge pull request #1831 from sdtsui/pre-merge-fixes | Dan Finlay | 2017-07-27 | 4 | -11/+8 | |
| | | | |\ \ \ \ \ |