aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | | * | | Merge branch 'master' into new-currency-testKevin Serrano2017-09-2122-237/+149
| | | | | | | | | |\ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #2129 from MetaMask/json-rpc-engine-bumpv3.10.3Frankie2017-09-202-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | changelog - add note on filter fixeskumavis2017-09-201-0/+1
| | * | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into json-rpc-en...kumavis2017-09-2026-262/+191
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #2126 from MetaMask/v3.10.2-1Frankie2017-09-202-1/+5
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | v3.10.2 - changelogkumavis2017-09-191-0/+4
| | * | | | | | | | | | | v3.10.2kumavis2017-09-191-1/+1
| |/ / / / / / / / / / /
| | * | | | | | | | | | deps - bump json-rpc-middleware-streamkumavis2017-09-201-1/+1
| | * | | | | | | | | | deps - bump json-rpc-enginekumavis2017-09-201-2/+1
| | | | | | | | | | * | Comply with current currency API and add additional styling.Kevin Serrano2017-09-193-4/+4
| | | | | | | | | | * | Fix the property query for new currencies.Kevin Serrano2017-09-191-2/+2
| | | | | | | | | | * | Fix the changelog again.Kevin Serrano2017-09-191-3/+2
| | | | | | | | | | * | Add additional attribution to changelog.Kevin Serrano2017-09-191-0/+3
| | | | | | | | | | * | Another merge conflict resolved.Roman Rodov2017-09-191-4/+4
| | | | | | | | | | * | Resolve merge conflicts for currency sort merge.Roman Rodov2017-09-191-1/+3
| | | | | | | | | | * | Merge branch 'master' into new-currency-testKevin Serrano2017-09-1916-198/+220
| | | | | | | | | | |\ \
| | | | | | | | | | * | | Modify conversion to new api.Kevin Serrano2017-09-152-58/+597
| | | | | | | | | | * | | Merge branch 'master' into new-currency-testKevin Serrano2017-09-1433-236/+483
| | | | | | | | | | |\ \ \ | | | | |_|_|_|_|_|_|/ / / | | | |/| | | | | | | | |
| | | | | | | | | | * | | Merge branch 'master' into new-currency-testKevin Serrano2017-09-068-13/+20
| | | | | | | | | | |\ \ \
| | | | | | | | | | * \ \ \ Merge branch 'master' into new-currency-testKevin Serrano2017-08-304-22/+73
| | | | | | | | | | |\ \ \ \
| | | | | | | | | | * | | | | integrate infura currencyKevin Serrano2017-08-304-7/+66
* | | | | | | | | | | | | | | Use font-awesome icons for create and import account.Dan2017-09-281-9/+5
* | | | | | | | | | | | | | | Makes styling fixes to account dropdown.Dan2017-09-282-10/+12
* | | | | | | | | | | | | | | Keep privateKey out of state and clear it after closing export private key mo...Dan2017-09-282-20/+40
* | | | | | | | | | | | | | | Adds a back button to export private key modal; connects account details to s...Dan2017-09-285-6/+62
* | | | | | | | | | | | | | | Implement Confirm Deploy Contract screenChi Kei Chan2017-09-274-2/+357
* | | | | | | | | | | | | | | Update the correct values in state when estimates are received.Dan2017-09-272-18/+15
* | | | | | | | | | | | | | | Gets gas and price estimates when send components mount.Dan2017-09-273-42/+27
* | | | | | | | | | | | | | | Restore notification functionalityDan2017-09-272-0/+14
* | | | | | | | | | | | | | | Return null if transaction.key is shapeshiftChi Kei Chan2017-09-272-53/+18
* | | | | | | | | | | | | | | Connect export key modal to state and enable actions.Dan2017-09-273-15/+104
* | | | | | | | | | | | | | | Merge pull request #2157 from danjm/MM-57-use-gas-estimatorChi Kei Chan2017-09-263-29/+183
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'NewUI-flat' into MM-57-use-gas-estimatorChi Kei Chan2017-09-265-4/+104
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Remove unnecessary trailing comma.Dan2017-09-261-1/+1
* | | | | | | | | | | | | | | | Select all in to and from of send screens, instead of clearing on focus.Dan2017-09-262-15/+5
* | | | | | | | | | | | | | | | Able to change selections in to and from fields of send and send token.Dan2017-09-262-2/+19
* | | | | | | | | | | | | | | | Export private key modal body ui.Dan2017-09-263-1/+92
| * | | | | | | | | | | | | | | Send token now estimates gas and price.Dan2017-09-261-8/+37
| * | | | | | | | | | | | | | | Refactor to store estimated gas and price in local state, return promise from...Dan2017-09-263-81/+38
| * | | | | | | | | | | | | | | Estimate gasPrice and gasLimit in send screen.Dan2017-09-263-7/+126
| * | | | | | | | | | | | | | | Update send token to handle errors onBlur events and prevent clicking send un...Dan2017-09-261-12/+59
| * | | | | | | | | | | | | | | Handles errors with to field and renders warnings from backend in send token.Dan2017-09-261-1/+1
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Exports private key modal opens from dropdown.Dan2017-09-244-54/+110
* | | | | | | | | | | | | | | Add Confirm Send token screenChi Kei Chan2017-09-236-64/+489
* | | | | | | | | | | | | | | get identities from getState() instead of passing from caller, only set new a...Dan2017-09-232-8/+9
* | | | | | | | | | | | | | | New account modal now allows for addition of account name.Dan2017-09-233-7/+35
* | | | | | | | | | | | | | | Default class params to empty string in readonly-inputDan2017-09-231-2/+2
* | | | | | | | | | | | | | | ReadOnlyInput component.Dan2017-09-233-13/+34
* | | | | | | | | | | | | | | Open account details modal on buy -> direct deposit.Dan2017-09-231-1/+11
* | | | | | | | | | | | | | | Client side error handling for from, to and amount fields in send.jsDan2017-09-234-44/+184
* | | | | | | | | | | | | | | Refactor Confirmation Tx to render different screenChi Kei Chan2017-09-222-183/+163
* | | | | | | | | | | | | | | Integrate Add TokenChi Kei Chan2017-09-226-255/+333
* | | | | | | | | | | | | | | Abstract account modal.Dan2017-09-224-63/+96
* | | | | | | | | | | | | | | Confirm screen shows amount plus gas in total fieldDan2017-09-222-6/+29
* | | | | | | | | | | | | | | Clean up code in send.jsDan2017-09-221-234/+193
* | | | | | | | | | | | | | | Handles errors with to field and renders warnings from backend in send token.Dan2017-09-221-11/+17
* | | | | | | | | | | | | | | Add Token UI - hover/select state; fetch token addressChi Kei Chan2017-09-213-19/+82
* | | | | | | | | | | | | | | Add Add Token UI; Add Fuzzy search for tokensChi Kei Chan2017-09-205-140/+458
* | | | | | | | | | | | | | | Buy Modal StylingChi Kei Chan2017-09-202-10/+17
* | | | | | | | | | | | | | | Ensure conversion util does not return insignificant trailing zeroes.Dan2017-09-201-1/+1
* | | | | | | | | | | | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-09-1925-241/+150
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #2121 from MetaMask/i2115-DoNotFailOnRetriesv3.10.2Frankie2017-09-192-3/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Bump changelogDan Finlay2017-09-191-0/+2
| | * | | | | | | | | | | | | | Do not mark a retry tx failed that has been broadcast successfullyDan Finlay2017-09-191-3/+9
| * | | | | | | | | | | | | | | Merge pull request #2119 from MetaMask/mascara-tests2Frankie2017-09-191-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | tests - integration - re-add mascara to normal runkumavis2017-09-191-1/+1
| * | | | | | | | | | | | | | | | Merge pull request #2118 from MetaMask/mascara-testskumavis2017-09-191-1/+1
| |\| | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | test - integration - bump timeoutkumavis2017-09-191-1/+1
| * | | | | | | | | | | | | | | Merge pull request #2098 from MetaMask/mascara-testsFrankie2017-09-1917-229/+114
| |\| | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | tests - integration - remove failing mascara integration tests from normal ru...kumavis2017-09-191-1/+1
| | * | | | | | | | | | | | | tests - mascara - increase timeout before test startskumavis2017-09-161-1/+1
| | * | | | | | | | | | | | | test - mascara - move skip reload test flagkumavis2017-09-162-1/+1
| | * | | | | | | | | | | | | mascara - proxy - small cleanupkumavis2017-09-161-2/+1
| | * | | | | | | | | | | | | tests - integration - add mascara to integration test runkumavis2017-09-161-1/+1
| | * | | | | | | | | | | | | tests - integration - mascara - small cleanup and timeout adjustmentskumavis2017-09-162-9/+5
| | * | | | | | | | | | | | | set time if platform is mascarafrankiebee2017-09-162-2/+5
| | * | | | | | | | | | | | | remove testem filesfrankiebee2017-09-163-35/+1
| | * | | | | | | | | | | | | dont reload on initial download and wait before passing sw to uifrankiebee2017-09-163-18/+28
| | * | | | | | | | | | | | | tests - integration - get flat and mascara tests closer to compatiblekumavis2017-09-149-142/+18
| | * | | | | | | | | | | | | tests - refactor and rename npm scriptskumavis2017-09-143-24/+25
| | * | | | | | | | | | | | | tests - mascara - move temp build files into dist/mascarakumavis2017-09-142-10/+10
| | * | | | | | | | | | | | | tests - start migrating mascara tests to karmakumavis2017-09-148-17/+50
| | * | | | | | | | | | | | | tests - break out coveralls npm scriptkumavis2017-09-141-1/+2
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #2117 from MetaMask/Version-3.10.1kumavis2017-09-192-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Version 3.10.1v3.10.1Dan Finlay2017-09-192-1/+3
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge pull request #2075 from MetaMask/mixed-caseDan Finlay2017-09-193-0/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' into mixed-caseDan Finlay2017-09-1914-196/+218
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Check if all lower or upper before doing checksum.Kevin Serrano2017-09-131-1/+1
| | * | | | | | | | | | | | | Changelogaroo.Kevin Serrano2017-09-131-0/+1
| | * | | | | | | | | | | | | Add specific error message for failed address checksum.Kevin Serrano2017-09-132-0/+12
| | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #2080 from MetaMask/fix-tooltipDan Finlay2017-09-194-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' into fix-tooltipDan Finlay2017-09-1913-195/+216
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | changelog.Kevin Serrano2017-09-131-0/+1
| | * | | | | | | | | | | | fixed position of tooltips to avoid overflow.Kevin Serrano2017-09-133-3/+3
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-09-192-0/+10
|\| | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #2093 from MetaMask/max-validationDan Finlay2017-09-192-25/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Haha silly me, only when gas is estimated and not explicit.Kevin Serrano2017-09-141-1/+1
| | * | | | | | | | | | | Bump changelog.Kevin Serrano2017-09-141-0/+1
| | * | | | | | | | | | | Lower warning threshold for high tx fee to account for fluctuating blockGasLi...Kevin Serrano2017-09-141-1/+2
| | * | | | | | | | | | | Add warning of higher failure risk since app proposed gasLimit.Kevin Serrano2017-09-141-25/+39
| | |/ / / / / / / / / /
* | | | | | | | | | | | Merge pull request #2116 from chikeichan/nmChi Kei Chan2017-09-1962-640/+5027
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix Merge Problems; update yarn lockChi Kei Chan2017-09-192-49/+558
| * | | | | | | | | | | | Merge branch 'master' into nmChi Kei Chan2017-09-1961-591/+4469
|/| | | | | | | | | | | | | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #2070 from MetaMask/filter-leak-fix3Dan Finlay2017-09-1512-170/+175
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge branch 'filter-leak-fix3' of github.com:MetaMask/metamask-extension int...kumavis2017-09-142-1/+2
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into filter-leak-fix3kumavis2017-09-142-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #2079 from MetaMask/FixSupportLinkKevin Serrano2017-09-132-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Bump changelogDan Finlay2017-09-131-0/+1
| | * | | | | | | | | | | Fix support linkDan Finlay2017-09-131-1/+1
| |/ / / / / / / / / / /
| | * / / / / / / / / / createOriginMiddleware - fix var namekumavis2017-09-141-1/+1
| | |/ / / / / / / / /
| | * | | | | | | | | changelog - add note of filter memory leak fixkumavis2017-09-141-0/+1
| | * | | | | | | | | metamask controller - destroy filter polyfill on disconnectkumavis2017-09-141-4/+10
| | * | | | | | | | | metamask controller - move middleware into seperate fileskumavis2017-09-145-35/+45
| | * | | | | | | | | debug - prefer logger over consolekumavis2017-09-142-9/+9
| | * | | | | | | | | metamask cont - standardize multiplex stream namingkumavis2017-09-141-8/+8
| | * | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-l...kumavis2017-09-1318-182/+339
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #2073 from MetaMask/greenkeeper/babel-eslint-8.0.0kumavis2017-09-131-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | chore(package): update babel-eslint to version 8.0.0greenkeeper[bot]2017-09-121-1/+1
| * | | | | | | | | | | Merge pull request #2074 from MetaMask/export-state-logskumavis2017-09-132-3/+5
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Add to changelog.Kevin Serrano2017-09-131-0/+1
| | * | | | | | | | | | | Convert state logs into a download.Kevin Serrano2017-09-131-3/+4
| * | | | | | | | | | | | Merge pull request #2069 from MetaMask/integration-tests-fix2Thomas Huang2017-09-138-80/+172
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | ci - remove old testem configkumavis2017-09-121-9/+0
| | * | | | | | | | | | | tests - integration - fix bad cherry-pickkumavis2017-09-121-16/+7
| | * | | | | | | | | | | test - integration - drop testem for karmakumavis2017-09-125-56/+150
| | * | | | | | | | | | | test - integration - remove redundant testem scriptskumavis2017-09-122-2/+0
| | * | | | | | | | | | | test - integration - build - manually exit from test builder + add bundle des...kumavis2017-09-121-1/+2
| | * | | | | | | | | | | ci - dont attempt to submit coveralls if not configuredkumavis2017-09-121-1/+1
| | * | | | | | | | | | | test - integration - build - use pump + log bundling informationkumavis2017-09-121-6/+12
| | * | | | | | | | | | | ci - deps - download latest chrome and firefoxkumavis2017-09-121-1/+12
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge pull request #2072 from MetaMask/kumavis-patch-2Kevin Serrano2017-09-121-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Rename add-to-firef.md to add-to-firefox.mdkumavis2017-09-121-0/+0
| |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #2068 from MetaMask/export-as-fileDan Finlay2017-09-124-9/+48
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix typo.Kevin Serrano2017-09-121-2/+2
| | * | | | | | | | | | Change the changelogKevin Serrano2017-09-121-0/+3
| | * | | | | | | | | | Add ability to save seed words as file.Kevin Serrano2017-09-121-0/+10
| | * | | | | | | | | | Add some styling.Kevin Serrano2017-09-121-0/+3
| | * | | | | | | | | | Move function as util function.Kevin Serrano2017-09-122-16/+18
| | * | | | | | | | | | Basic private key download file functionality.Kevin Serrano2017-09-121-9/+30
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #2067 from MetaMask/integration-tests-fixDan Finlay2017-09-121-94/+87
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | test - integration - use async fn for error catchingkumavis2017-09-121-94/+87
| * | | | | | | | | | Merge pull request #2065 from MetaMask/Version-3.10.0Kevin Serrano2017-09-122-1/+4
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Version 3.10.0v3.10.0Dan Finlay2017-09-122-1/+4
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #2045 from MetaMask/rejectallunapprovedDan Finlay2017-09-124-15/+43
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Show reject all only when tx count is > 1Kevin Serrano2017-09-122-2/+6
| | * | | | | | | | | Remove markdown from changelog.Kevin Serrano2017-09-121-1/+1
| | * | | | | | | | | Merge github.com:MetaMask/metamask-extension into rejectallunapprovedKevin Serrano2017-09-128-43/+90
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Changelog and attribution.Kevin Serrano2017-09-081-0/+1
| | * | | | | | | | | Convert icon to button.Kevin Serrano2017-09-082-12/+18
| | * | | | | | | | | Fold submit and buy ether into one button slotKevin Serrano2017-09-081-15/+9
| | * | | | | | | | | Merge branch 'master' of github.com:davidp94/metamask-extension into rejectal...Kevin Serrano2017-09-082-0/+23
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | fix goHomedavidp942017-08-151-2/+6
| | | * | | | | | | | | remove unused action typedavidp942017-08-151-1/+0
| | | * | | | | | | | | cancel all txsDavidNinja2017-08-152-0/+20
| | | | * | | | | | | | contentscript - fix obj-multiplex instantiation and use pump for streamskumavis2017-09-121-12/+33
| | | | * | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-l...kumavis2017-09-125-19/+28
| | | | |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #2051 from MetaMask/ci-speedupDan Finlay2017-09-121-4/+0
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | ci - dont need global install of test utilskumavis2017-09-081-4/+0
| * | | | | | | | | | | | Merge pull request #2049 from MetaMask/i1938-removecryptopermissionsKevin Serrano2017-09-112-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Merge branch 'master' into i1938-removecryptopermissionskumavis2017-09-082-6/+27
| | |\| | | | | | | | | | |
| | * | | | | | | | | | | | Add to changelog.Kevin Serrano2017-09-081-0/+1
| | * | | | | | | | | | | | Remove cryptonator from chrome permissions.Kevin Serrano2017-09-081-3/+2
| * | | | | | | | | | | | | Merge pull request #2047 from MetaMask/i1997-networkindicateThomas Huang2017-09-091-3/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Add cursor on hover on loading. Change some wording.Kevin Serrano2017-09-081-3/+3
| | * | | | | | | | | | | | | Add caret to indicate network is dropdown.Kevin Serrano2017-09-081-0/+5
| * | | | | | | | | | | | | | Merge pull request #2057 from MetaMask/Version-3.9.13kumavis2017-09-093-26/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Version 3.9.13v3.9.13Dan Finlay2017-09-092-1/+5
| | * | | | | | | | | | | | | inpage provider - define sendAsync on the prototypekumavis2017-09-091-25/+27
| | | | | | | * | | | | | | | inpage - use obj-multiplex modulekumavis2017-09-081-6/+6
| | | | | | | * | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-l...kumavis2017-09-0823-56/+193
| | | | | | | |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #2048 from MetaMask/i1984-tokenvalidationsDan Finlay2017-09-082-6/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Fix typo.Kevin Serrano2017-09-081-1/+1
| | * | | | | | | | | | | | | Fix link to open new tab.Kevin Serrano2017-09-081-0/+1
| | * | | | | | | | | | | | | Bump changelog.Kevin Serrano2017-09-081-0/+2
| | * | | | | | | | | | | | | Add front-end validation for own adddresses as a token contract address. Add ...Kevin Serrano2017-09-081-6/+24
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge pull request #2046 from MetaMask/RewordSeedRestoreKevin Serrano2017-09-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Reword forgot password to restore seed phraseDan Finlay2017-09-081-1/+1
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge pull request #1987 from MetaMask/CheckFaq67Kevin Serrano2017-09-081-0/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Add test for trying to reproduce faq#67Dan Finlay2017-08-301-0/+19
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge pull request #1893 from MetaMask/readd-looseThomas Huang2017-09-086-5/+30
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Place object property retrieval inside try-catchKevin Serrano2017-09-081-2/+3
| | * | | | | | | | | | Change expected type to array.Kevin Serrano2017-09-081-1/+1
| | * | | | | | | | | | Changelog bumpKevin Serrano2017-09-071-0/+1
| | * | | | | | | | | | Merge branch 'master' into readd-looseKevin Serrano2017-09-075-7/+11
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #2033 from MetaMask/Version-3.9.12kumavis2017-09-072-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | / / / | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| | * | | | | | | | | Version 3.9.12v3.9.12Dan Finlay2017-09-072-1/+4
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #2017 from MetaMask/DevEnviornmentkumavis2017-09-072-4/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Update mock-store dependencytmashuang2017-09-071-2/+2
| | * | | | | | | | | Update development storetmashuang2017-09-051-2/+2
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge pull request #2023 from MetaMask/web3-1.0-fixDan Finlay2017-09-071-2/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | inpage - bug fixkumavis2017-09-061-2/+3
| |/ / / / / / / / /
| | | * | | | | | | Properly update keyring state on new account addition.Kevin Serrano2017-09-071-1/+2
| | | * | | | | | | Merge branch 'master' into readd-looseKevin Serrano2017-09-063-3/+16
| | | |\ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #2019 from MetaMask/i2016-ImproveSignDeprecationWarningKevin Serrano2017-09-062-2/+14
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Make eth_sign deprecation warning more usefulDan Finlay2017-09-062-2/+14
| | |/ / / / / / / /
| * | | | | | | | | Merge pull request #2018 from MetaMask/i2014-BetterWeb3DeprecationWarningKevin Serrano2017-09-062-1/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Make web3 deprecation notice more usefulDan Finlay2017-09-062-1/+2
| |/ / / / / / / /
| | * | | | | | | Resolve merge conflict from masterKevin Serrano2017-09-0632-270/+3791
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #2008 from MetaMask/mascara-fixkumavis2017-09-022-4/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | mascara - fix iframe stream constructorkumavis2017-09-022-4/+4
| * | | | | | | | | Merge pull request #1897 from MetaMask/greenkeeper/sinon-3.2.0Thomas Huang2017-09-021-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | chore(package): update sinon to version 3.2.0greenkeeper[bot]2017-08-101-1/+1
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge pull request #2007 from MetaMask/i2005-HttpsLinjsKevin Serrano2017-09-023-6/+8
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Bump changelogDan Finlay2017-09-021-0/+2
| | * | | | | | | | Update etherscan links to httpsDan Finlay2017-09-021-5/+5
| | * | | | | | | | Update support linkDan Finlay2017-09-021-1/+1
| |/ / / / / / / /
| * | | | | | | | Merge pull request #1988 from MetaMask/i1986-AddVersionToStateLogsKevin Serrano2017-08-302-1/+5
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into i1986-AddVersionToStateLogsKevin Serrano2017-08-302-1/+2
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #1992 from MetaMask/MultipleTokensTextKevin Serrano2017-08-302-1/+2
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | Update changelogThomas Huang2017-08-301-0/+1
| | * | | | | | | | Multiple tokens shows the amount when greater than 1Thomas Huang2017-08-301-1/+1
| |/ / / / / / / /
| | * / / / / / / Add version to state logsDan Finlay2017-08-302-1/+5
| |/ / / / / / /
| * | | | | | | Merge pull request #1985 from MetaMask/i1974-EnsureDeepCloneHistorykumavis2017-08-291-0/+26
| |\ \ \ \ \ \ \
| | * | | | | | | Add some tests to tx-state-history-helperDan Finlay2017-08-291-0/+26
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge pull request #1965 from MetaMask/inpage-provider-fixesKevin Serrano2017-08-293-22/+47
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Merge branch 'master' into inpage-provider-fixeskumavis2017-08-298-41/+189
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | inpage - add changelog notekumavis2017-08-291-0/+3
| | * | | | | | inpage - lint fixkumavis2017-08-291-1/+1
| | * | | | | | inpage provider - autoreload - improve readabilitykumavis2017-08-241-15/+32
| | * | | | | | inpage provider - only warn web3 usage once per sessionkumavis2017-08-241-6/+11
| | * | | | | | inpage provider - sync rpc - default to null valueskumavis2017-08-241-3/+3
| | | | * | | | Readd loose label onto accounts.Kevin Serrano2017-08-104-4/+26
| | | | | | * | lint - remove dead codekumavis2017-09-081-1/+0
| | | | | | * | deps - bump jsonrpc filters for log filter formate fixkumavis2017-09-081-1/+1
| | | | | | * | metamask - add jsonrpc filter middleware on per-connection enginekumavis2017-09-081-2/+8
| | | | | | * | inpage - distinguish pump vs pipekumavis2017-09-081-4/+4
| | | | | | * | streams - use pump and published obj-multiplexkumavis2017-09-085-81/+44
| | | | | | * | inpage - add idRemapMiddlewarekumavis2017-09-082-1/+4
| | | | | | * | inpage - use json-rpc-engine for inpage-providerkumavis2017-08-253-46/+43
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge pull request #1977 from MetaMask/Version-3.9.11Dan Finlay2017-08-242-1/+3
| |\ \ \ \ \ \
| | * | | | | | Version 3.9.11v3.9.11Dan Finlay2017-08-242-1/+3
| |/ / / / / /
| * | | | | | Merge pull request #1973 from MetaMask/hotfix-migration019kumavis2017-08-243-1/+85
| |\ \ \ \ \ \
| | * | | | | | fall back to `latest` if blockNumber is nullfrankiebee2017-08-241-1/+1
| | * | | | | | Make method return a numberDan Finlay2017-08-241-1/+1
| | * | | | | | Only cancel pending txs with non continuously high noncesDan Finlay2017-08-241-1/+24
| | * | | | | | fix descriptionfrankiebee2017-08-241-2/+2
| | * | | | | | hotfix - fail submitted txs whos nonce is out of boundfrankiebee2017-08-242-0/+61
| * | | | | | | Merge pull request #1971 from MetaMask/SetMaxRetryLimitkumavis2017-08-243-2/+13
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Bump changelogDan Finlay2017-08-241-0/+1
| | * | | | | | Fail transactions after a day of retriesDan Finlay2017-08-242-2/+12
| |/ / / / / /
| * | | | | | Merge pull request #1969 from MetaMask/i1966-IgnoreInvalidPendingNoncesDan Finlay2017-08-243-38/+89
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Bump changelogDan Finlay2017-08-241-0/+2
| | * | | | | Enforce nonces as type stringDan Finlay2017-08-241-2/+10
| | * | | | | Use toNumber methodDan Finlay2017-08-241-2/+1
| | * | | | | Fix network nonce parsingDan Finlay2017-08-241-4/+11
| | * | | | | Corrected test constraintsDan Finlay2017-08-241-2/+2
| | * | | | | Add mysterious failing testDan Finlay2017-08-241-0/+20
| | * | | | | Pass nonce testsDan Finlay2017-08-242-12/+11
| | * | | | | Got all tests but one passingDan Finlay2017-08-241-0/+1
| | * | | | | Fix new test, break an older maybe wrong oneDan Finlay2017-08-242-29/+27
generated by cgit (git 2.34.1) at 2024-10-19 23:28:59 +0800