aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* test - integration - better error handlingkumavis2017-08-041-10/+9
|
* test - integration - syntax - prefer constkumavis2017-08-041-12/+7
|
* test - integration - remove unused codekumavis2017-08-041-1/+3
|
* test - integration - throw error on failurekumavis2017-08-041-2/+2
|
* ui - dropdown - use Object.assign syntax to appease coverage parserkumavis2017-08-041-3/+2
|
* Merge branch 'master' into NewUIkumavis2017-08-049-44/+50
|\
| * Merge pull request #1857 from MetaMask/hotFixCancleTxkumavis2017-08-044-8/+25
| |\ | | | | | | fix cancelTransaction not receiving a callback
| | * test - actions - tx - fix async testkumavis2017-08-041-5/+4
| | |
| | * test - actions - remove commented codekumavis2017-08-041-2/+0
| | |
| | * nodeify - test - syntax nitpickkumavis2017-08-041-3/+3
| | |
| | * add test for no callback errorfrankiebee2017-08-041-0/+11
| | |
| | * fix testfrankiebee2017-08-041-2/+7
| | |
| | * fix cancelTransaction not reciving a callbackfrankiebee2017-08-042-4/+8
| | |
| * | Merge pull request #1856 from MetaMask/v3.9.3Frankie2017-08-042-1/+4
| |\ \ | | | | | | | | v3.9.3
| | * | v3.9.3kumavis2017-08-042-1/+4
| |/ /
| * | Merge pull request #1855 from MetaMask/blacklist-refactor2v3.9.3Kevin Serrano2017-08-041-1/+1
| |\ \ | | | | | | | | deps - bump eth-detect-phishing
| | * | deps - bump eth-detect-phishingkumavis2017-08-041-1/+1
| | | |
| * | | Merge pull request #1852 from MetaMask/blacklist-refactor2Kevin Serrano2017-08-043-35/+20
| |\| | | | | | | | | | blacklist - use module eth-phishing-detect
| | * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵kumavis2017-08-041-3/+0
| | |\ \ | | |/ / | |/| | | | | | blacklist-refactor2
| | * | blacklist - use module eth-phishing-detectkumavis2017-08-043-35/+20
| | |/
* | | Merge pull request #1858 from sdtsui/NewUIkumavis2017-08-047-31/+120
|\ \ \ | | | | | | | | UI Tweaks, Minor Bugfixes, and Dropdown Resizing
| * | | Adjust padding of accountSwitcher dropdownsdtsui2017-08-041-4/+7
| | | |
| * | | Adjust top and bottom padding of accountSwitchersdtsui2017-08-041-2/+9
| | | |
| * | | Lint ui/appsdtsui2017-08-043-14/+11
| | | |
| * | | Allow new accounts selector to handle clickssdtsui2017-08-041-2/+2
| | | |
| * | | Increase size of accountSelection dropdownsdtsui2017-08-041-8/+22
| | | |
| * | | Increase size of settings dropdown and account settings dropdownsdtsui2017-08-042-2/+2
| | | |
| * | | Increase size of network dropdownsdtsui2017-08-044-4/+28
| | | |
| * | | De-dupe click handler for sandwich-expandosdtsui2017-08-041-6/+12
| | | |
| * | | Add note with previous fa-angle-down for future refactorsdtsui2017-08-041-0/+2
| | | |
| * | | Position account switcher icon back in app headersdtsui2017-08-041-2/+6
| | | |
| * | | Move accountselector menu-droppo up to app-headersdtsui2017-08-041-0/+22
| | | |
| * | | Disable account selection dropdown from account detailssdtsui2017-08-042-7/+16
| | | |
| * | | Adjust account checksumAddress location upsdtsui2017-08-041-0/+1
| | | |
* | | | Fix fox positioning.Kevin Serrano2017-08-041-1/+5
|/ / /
* | | Fix wonky widths for notices.Kevin Serrano2017-08-042-2/+6
| | |
* | | Add maximum width for private key revealKevin Serrano2017-08-041-1/+1
| | |
* | | Remove 100% properties that were messing up sizing.Kevin Serrano2017-08-041-2/+0
| | |
* | | Add QR functionalityKevin Serrano2017-08-041-0/+13
| | |
* | | Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUIKevin Serrano2017-08-0428-695/+829
|\ \ \ | |/ / |/| |
| * | lint fixkumavis2017-08-022-3/+3
| | |
| * | Merge pull request #1841 from sdtsui/fix/dropdown-toggleKevin Serrano2017-08-022-4/+32
| |\ \ | | | | | | | | [Part-1] Fix/dropdown toggle
| | * | Fix dropdown behavior - networksdtsui2017-07-291-1/+11
| | | |
| | * | Fix dropdown toggle behavior - settingssdtsui2017-07-291-1/+5
| | | |
| | * | Fix dropdown toggle behavior - account dropdownssdtsui2017-07-291-2/+16
| |/ /
| * | Create distinct responsive 'home.html' file, hard-code popup.html sizeDan Finlay2017-07-292-1/+13
| | | | | | | | | | | | Because firefox was having inconsistent sizing, made a second html file for forcing the view to a certain size. Still allows us to develop a responsive interface via the `home.html` file, which shares all the same react JS & CSS as popup.html.
| * | Correct viewport paramDan Finlay2017-07-281-1/+1
| | |
| * | Fix react warningDan Finlay2017-07-281-0/+6
| | |
| * | Limit max width of seed word conf screenDan Finlay2017-07-281-2/+5
| | |
| * | Correct token pluralization for one tokenDan Finlay2017-07-281-1/+3
| | |
| * | Bump changelogDan Finlay2017-07-281-0/+2
| | |
| * | Merge branch 'master' into NewUIDan Finlay2017-07-288-46/+104
| |\ \
| * \ \ Merge branch 'master' into NewUIDan Finlay2017-07-2816-58/+180
| |\ \ \
| * | | | Set min gas price to 1 gweiDan Finlay2017-07-281-1/+1
| | | | |
| * | | | Disable user zoom in mobile modeDan Finlay2017-07-281-1/+1
| | | | |
| * | | | Fix viewport width to 1Dan Finlay2017-07-281-1/+1
| | | | |
| * | | | Ensure loading indication is full screenDan Finlay2017-07-281-0/+1
| | | | |
| * | | | Fix loading indication placementDan Finlay2017-07-281-1/+1
| | | | |
| * | | | Remove unused parameterDan Finlay2017-07-282-2/+2
| | | | |
| * | | | Restore support linkDan Finlay2017-07-281-4/+4
| | | | |
| * | | | Fix info page formattingDan Finlay2017-07-281-6/+14
| | | | |
| * | | | Fix spellingDan Finlay2017-07-281-1/+1
| | | | |
| * | | | Remove deprecated responsive dev docsDan Finlay2017-07-282-12/+0
| | | | |
| * | | | Bump menu-droppo to 2.0.1Dan Finlay2017-07-281-1/+1
| | | | |
| * | | | Fix custom provider indicationDan Finlay2017-07-272-6/+6
| | | | |
| * | | | Remove object spread syntaxDan Finlay2017-07-271-7/+9
| | | | |
| * | | | Adjust mobile scale for smaller devicesDan Finlay2017-07-271-1/+1
| | | | |
| * | | | Set initial scale for mobile.Dan Finlay2017-07-273-3/+6
| | | | |
| * | | | Merge pull request #1831 from sdtsui/pre-merge-fixesDan Finlay2017-07-274-11/+8
| |\ \ \ \ | | | | | | | | | | | | Add minor fixes, including account selection scroll
| | * | | | Re-center network dropdownsdtsui2017-07-272-2/+5
| | | | | |
| | * | | | Make account selection dropdown menu scrollable when too large for viewsdtsui2017-07-271-0/+2
| | | | | |
| | * | | | Remove Account Settings item from optionsMenu, unnecessarysdtsui2017-07-271-8/+0
| | | | | |
| | * | | | Bump version of menu-droppo, no longer needs css transitionssdtsui2017-07-271-1/+1
| |/ / / /
| * | | | Lots of flex rearrangement on account detail viewDan Finlay2017-07-2611-134/+129
| | | | | | | | | | | | | | | | | | | | Includes removal of ReactCssTransitionGroup for a simpler UI refactor.
| * | | | Remove responsive folder from gulpDan Finlay2017-07-261-1/+0
| | | | |
| * | | | Restore sort order fixDan Finlay2017-07-252-2/+5
| | | | |
| * | | | Replace ui with responsive-uiDan Finlay2017-07-25138-13934/+224
| | | | |
| * | | | Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUIDan Finlay2017-07-251-0/+1
| |\ \ \ \
| | * \ \ \ Merge pull request #1815 from sdtsui/fix/menu-cursorkumavis2017-07-251-0/+1
| | |\ \ \ \ | | | | | | | | | | | | | | Add cursor to account menu buttons
| | | * | | | Add cursor to account menu buttonssdtsui2017-07-251-0/+1
| | |/ / / /
| * / / / / Css tweaksDan Finlay2017-07-252-1/+7
| |/ / / /
| * | | | Improve account-detail panel responsivenessDan Finlay2017-07-211-1/+5
| | | | |
| * | | | Prevent buy button from floatingDan Finlay2017-07-211-6/+0
| | | | |
| * | | | Make main account detail view more responsiveDan Finlay2017-07-216-8/+32
| | | | |
| * | | | Merge pull request #1802 from MetaMask/RestructureNewUIDan Finlay2017-07-21268-295/+645
| |\ \ \ \ | | | | | | | | | | | | Restructure new ui branch folders
| | * | | | Fix referenceDan Finlay2017-07-212-2/+2
| | | | | |
| | * | | | Fix css linksDan Finlay2017-07-212-4/+4
| | | | | |
| | * | | | Merge branch 'master' into NewUIDan Finlay2017-07-2127-214/+630
| | |\ \ \ \
| | * | | | | Move responsive ui into its own folder for easier mergesDan Finlay2017-07-21245-75/+9
| |/ / / / /
| * | | | | Merge pull request #1790 from sdtsui/newui-account-dropdownsDan Finlay2017-07-1913-589/+510
| |\ \ \ \ \ | | | | | | | | | | | | | | [newui] - Implement Advanced Option Menu & Account Switching Menu
| | * | | | | Reorder Account Selector and Account Optionssdtsui2017-07-192-115/+128
| | | | | | |
| | * | | | | Hook up new dropdown componentssdtsui2017-07-187-184/+157
| | | | | | |
| | * | | | | Remove account options iconssdtsui2017-07-183-177/+0
| | | | | | |
| | * | | | | Remove accounts screensdtsui2017-07-184-271/+244
| | | | | | |
| | * | | | | Add new tests for dropdown componentsdtsui2017-07-181-22/+86
| | | | | | |
| | * | | | | Bump version of menu-droppo to include bugfixsdtsui2017-07-181-1/+1
| | | | | | |
| | * | | | | Fix click handlers on AccountOptionsMenussdtsui2017-07-181-5/+5
| | | | | | |
| | * | | | | Cleanupsdtsui2017-07-185-33/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix lint error breaking gulp build Add presentational options menus
| * | | | | | Merge pull request #1772 from sdtsui/new-dropdownkumavis2017-07-143-0/+131
| |\| | | | | | | | | | | | | | | | | | | Implement NewUI Dropdown Component
| | * | | | | Brighten dropdown menu item\'s textsdtsui2017-07-141-3/+11
| | | | | | |
| | * | | | | Add tests for new dropdown componentsdtsui2017-07-132-0/+52
| | | | | | |
| | * | | | | Implement redesigned dropdownsdtsui2017-07-131-0/+71
| |/ / / / /
| * | | | | Merge branch 'master' into NewUIDan Finlay2017-07-066-9/+17
| |\ \ \ \ \
| * | | | | | Make responsive UI more flexyDan Finlay2017-07-045-12/+12
| | | | | | |
| * | | | | | Add responsive UI dev guideDan Finlay2017-07-042-0/+12
| | | | | | |
| * | | | | | Get duplicate UI template workingDan Finlay2017-07-04128-11/+13683
| | | | | | |
| * | | | | | Make folder for responsive UIDan Finlay2017-07-04125-3/+57
| | | | | | |
| * | | | | | Merge branch 'master' into NewUIDan Finlay2017-07-043-24/+52
| |\ \ \ \ \ \
| * | | | | | | Began creating new UI templateDan Finlay2017-07-043-1/+46
| | | | | | | |
* | | | | | | | Merge pull request #1850 from MetaMask/stackKevin Serrano2017-08-041-3/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | remove stack from txs
| * | | | | | | remove stack from txsfrankiebee2017-08-041-3/+0
|/ / / / / / /
* | | | | | | Merge pull request #1848 from MetaMask/transactionControllerRefractorkumavis2017-08-036-272/+331
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Transaction controller refractor part 1: promises for everyone and more tests!
| * | | | | | | remove unused sinonfrankiebee2017-08-031-1/+0
| | | | | | | |
| * | | | | | | use async with #publishTransactionfrankiebee2017-08-031-2/+2
| | | | | | | |
| * | | | | | | fix testfrankiebee2017-08-031-1/+1
| | | | | | | |
| * | | | | | | move newUnapprovedTransaction to transactions.jsfrankiebee2017-08-035-54/+115
| | | | | | | |
| * | | | | | | lint fixesfrankiebee2017-08-023-11/+4
| | | | | | | |
| * | | | | | | Merge branch 'master' into transactionControllerRefractorfrankiebee2017-08-0213-25/+163
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | fix spelling mistakefrankiebee2017-08-021-1/+1
| | | | | | | |
| * | | | | | | fix addTxDefaultsfrankiebee2017-08-022-2/+3
| | | | | | | |
| * | | | | | | add test for addTxDefaultsfrankiebee2017-08-021-5/+30
| | | | | | | |
| * | | | | | | make addUnapprovedTransaction async function and use promise based ethQueryfrankiebee2017-08-026-241/+219
| | | | | | | |
* | | | | | | | Merge pull request #1849 from MetaMask/blacklist-refactorKevin Serrano2017-08-0314-130/+156
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Blacklist refactor
| * | | | | | | blacklist controller - breakout from metamask and infura controllerskumavis2017-08-036-83/+108
| | | | | | | |
| * | | | | | | phishing detection - move phishing detection into contentscript and metamask ↵kumavis2017-08-0310-67/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | controller
| * | | | | | | obj-multiplex - missing name error + prefer const over varkumavis2017-08-031-6/+10
| | | | | | | |
| * | | | | | | blacklist - add tests for metamask subdomainskumavis2017-08-021-0/+12
| | | | | | | |
| * | | | | | | blacklist - clearer test formatkumavis2017-08-021-5/+5
|/ / / / / / /
* | | | | | | Merge pull request #1838 from MetaMask/i1805-LiveBlacklistUpdatingKevin Serrano2017-07-288-44/+103
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Live blacklist updating
| * | | | | | Do not blacklist filesDan Finlay2017-07-281-1/+0
| | | | | | |
| * | | | | | Add Levenshtein item to changelogDan Finlay2017-07-271-0/+1
| | | | | | |
| * | | | | | Merge branch 'master' into i1805-LiveBlacklistUpdatingDan Finlay2017-07-275-2/+67
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #1837 from MetaMask/i1833-levencheckDan Finlay2017-07-274-8/+62
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Levenshtein Checking Logic Added To Blacklist
| * | | | | | | Give credit where it is dueKevin Serrano2017-07-272-1/+5
| | | | | | | |
| * | | | | | | Changelog bumpKevin Serrano2017-07-271-0/+1
| | | | | | | |
| * | | | | | | Add levenshtein logic to blacklister.Kevin Serrano2017-07-272-8/+33
| | | | | | | |
| * | | | | | | Add test for blacklister.Kevin Serrano2017-07-271-0/+24
| | | | | | | |
| | * | | | | | Live update blacklist from InfuraDan Finlay2017-07-275-13/+17
| | | | | | | |
| | * | | | | | Merge branch 'master' into i1805-LiveBlacklistUpdatingDan Finlay2017-07-275-10/+21
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #1834 from MetaMask/Version-3.9.2Kevin Serrano2017-07-272-1/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Version 3.9.2
| * | | | | | | Version 3.9.2v3.9.2Dan Finlay2017-07-272-1/+4
|/ / / / / / /
* | | | | | | Merge pull request #1830 from MetaMask/providerProxyFixFrankie2017-07-273-9/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | NonceTracker - Provider proxy fix
| * | | | | | | nonce-tracker - fix testkumavis2017-07-271-3/+5
| | | | | | | |
| * | | | | | | nonce-tracker - hotfix for provider proxyingkumavis2017-07-272-5/+11
| | | | | | | |
| * | | | | | | nonce-tracker - add raw baseNonceHex to nonceDetailskumavis2017-07-271-1/+1
| | | | | | | |
| | * | | | | | Begin implementing live-updating blacklist, not working yetDan Finlay2017-07-273-8/+52
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #1829 from MetaMask/betterErrorsOnTxDan Finlay2017-07-272-4/+9
|\| | | | | | | | | | | | | | | | | | | | cleanup logState log and tx history
| * | | | | | tx cont - dont recursively store historykumavis2017-07-271-3/+9
| | | | | | |
| * | | | | | logState - dont redundantly log to consolekumavis2017-07-271-1/+0
| | | | | | |
* | | | | | | Merge pull request #1828 from MetaMask/betterErrorsOnTxFrankie2017-07-272-5/+12
|\| | | | | | | |/ / / / / |/| | | | | Nonce Tracker - better error messages, more debug info in tx history data
| * | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵kumavis2017-07-275-3/+13
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | betterErrorsOnTx
* | | | | | Merge pull request #1827 from MetaMask/test-coverageThomas Huang2017-07-261-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Coveralls badge directs to master branch
| * | | | | | Coveralls badge directs to master branchThomas Huang2017-07-261-1/+1
| | | | | | |
* | | | | | | Merge pull request #1816 from MetaMask/test-coveragekumavis2017-07-264-2/+12
|\| | | | | | | | | | | | | | | | | | | | Test coverage
| * | | | | | Run coveralls on all branchesThomas Huang2017-07-261-1/+1
| | | | | | |
| * | | | | | One script runs for Ci buildThomas Huang2017-07-262-3/+2
| | | | | | |
| * | | | | | Simplify the test-coverage scriptThomas Huang2017-07-251-1/+1
| | | | | | |
| * | | | | | Add coveralls to scriptThomas Huang2017-07-251-1/+1
| | | | | | |
| * | | | | | Configure ci build to run tests individuallyThomas Huang2017-07-241-0/+5
| | | | | | |
| * | | | | | Add Test Coverage with nyc package and coveralls for github badgeThomas Huang2017-07-243-2/+8
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #1823 from MetaMask/betterErrorsOnTxkumavis2017-07-263-8/+32
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add stack traces both in errors and as a way to track txMetas
| * \ \ \ \ \ Merge branch 'betterErrorsOnTx' of ↵frankiebee2017-07-265-25/+36
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/MetaMask/metamask-extension into betterErrorsOnTx
| * | | | | | | fix typofrankiebee2017-07-261-1/+1
| | | | | | | |
| | | | * | | | tx controller + nonce tracker - record nonce components on txMetakumavis2017-07-272-2/+9
| | | | | | | |
| | | | * | | | nonce-tracker - validation - add validation failing value type to error messagekumavis2017-07-271-3/+3
| | | | | | | |
| | | | * | | | nonce-tracker - validation - add validation failing value to error messagekumavis2017-07-271-3/+3
| | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'master' into betterErrorsOnTxFrankie2017-07-265-25/+36
| |/| | | | | | |/ / / / / |/| | | | |
* | | | | | Merge pull request #1824 from MetaMask/tx-cont-fixFrankie2017-07-264-24/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | TransactionController & NetworkController fixes
| * | | | | | tx cont - fix test to use async apikumavis2017-07-261-2/+6
| | | | | | |
| * | | | | | tx cont - add argument for provider constructorkumavis2017-07-262-17/+24
| | | | | | |
| * | | | | | tx cont - remove old cb from async fnkumavis2017-07-261-5/+5
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #1821 from MetaMask/fetch-retry-2Dan Finlay2017-07-261-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | prov-eng - bump to ignore json parse errors
| * | | | | prov-eng - bump to ignore json parse errorskumavis2017-07-261-1/+1
|/ / / / /
| * | | | fix stack wordingfrankiebee2017-07-261-2/+2
| | | | |
| * | | | use clonefrankiebee2017-07-262-2/+1
| | | | |
| * | | | remove line numbersfrankiebee2017-07-261-3/+3
| | | | |
| * | | | Add stack traces both in errors and as a way to track txMetasfrankiebee2017-07-264-8/+33
|/ / / /
* | | | Merge pull request #1801 from MetaMask/i1800-UpdateTutorialLinkKevin Serrano2017-07-211-1/+11
|\ \ \ \ | | | | | | | | | | Update tutorial link
| * | | | Add user support linkDan Finlay2017-07-211-0/+4
| | | | |
| * | | | Update tutorial linksDan Finlay2017-07-211-1/+7
|/ / / /
* | | | Merge pull request #1799 from MetaMask/Version-3.9.1kumavis2017-07-203-2/+4
|\ \ \ \ | | | | | | | | | | Version 3.9.1
| * | | | Version 3.9.1v3.9.1Dan Finlay2017-07-203-2/+4
|/ / / /
* | | | Merge pull request #1796 from MetaMask/1GweiMinGasPricekumavis2017-07-202-1/+2
|\ \ \ \ | | | | | | | | | | Lowered minimum gas price to 1 gwei
| * | | | Lowered minimum gas price to 1 gweiDan Finlay2017-07-202-1/+2
|/ / / /
* | | | Merge pull request #1794 from MetaMask/nonce-tracker-fixesDan Finlay2017-07-194-44/+88
|\ \ \ \ | | | | | | | | | | Nonce tracker fixes
| * | | | changelog - add nonce-tracker notekumavis2017-07-191-0/+1
| | | | |
| * | | | transactions - block nonce-tracker while updating pending transactionskumavis2017-07-192-14/+32
| | | | |
| * | | | nonce-tracker - fix lock mechanism to be a real mutexkumavis2017-07-192-11/+16
| | | | |
| * | | | transaction - promisify _checkPendingTxskumavis2017-07-191-27/+41
| | | | |
| * | | | nonce-tracker - return nonce as integerkumavis2017-07-191-1/+1
| | | | |
| * | | | nonce-tracker - validate nonce calc componentskumavis2017-07-191-3/+9
|/ / / /
* | | | Merge pull request #1787 from MetaMask/i1637-TransactionOrderkumavis2017-07-193-1/+23
|\ \ \ \ | | | | | | | | | | Fix transaction confirmation ordering
| * | | | Fix transaction confirmation orderingDan Finlay2017-07-183-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Newest tx or message will now always appear last, and a new tx proposed after the user has a confirmation box open will never change the confirmation to a different tx proposed. Fixes #1637
* | | | | Merge pull request #1791 from MetaMask/ciBadgekumavis2017-07-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Change Ci Badge url for readme
| * | | | | Shield looks bettertmashuang2017-07-191-1/+1
| | | | | |
| * | | | | Change Ci Badge url for readmetmashuang2017-07-191-1/+1
|/ / / / /
* | | | | Merge pull request #1786 from MetaMask/turnOffAutoFaucetDan Finlay2017-07-183-24/+1
|\ \ \ \ \ | |/ / / / |/| | | | turn off auto faucet
| * | | | turn off auto faucet and remove filefrankiebee2017-07-183-24/+1
|/ / / /
* | | | Merge pull request #1781 from MetaMask/AddSupportLinkKevin Serrano2017-07-182-2/+9
|\ \ \ \ | | | | | | | | | | Add support page link to help page
| * | | | Add support page link to help pageDan Finlay2017-07-182-2/+9
|/ / / / | | | | | | | | | | | | Also adjust github link to be a new bug link, which goes to the new issue page.
* | | | Merge pull request #1777 from MetaMask/InfuraTestkumavis2017-07-153-35/+64
|\ \ \ \ | | | | | | | | | | Infura Network response tests
| * | | | Sinon stub infura network statustmashuang2017-07-151-14/+18
| | | | |
| * | | | Update Sinontmashuang2017-07-151-1/+1
| | | | |
| * | | | Use Let instead of vartmashuang2017-07-151-1/+1
| | | | |
| * | | | Infura Network response teststmashuang2017-07-152-34/+59
|/ / / /
* | | | Merge pull request #1617 from MetaMask/nonce-trackerFrankie2017-07-149-121/+205
|\ \ \ \ | | | | | | | | | | transaction controller - use nonce-tracker
| * | | | make publishTransaction and signTransaction async methodsfrankiebee2017-07-143-32/+28
| | | | |
| * | | | remove denodeifyfrankiebee2017-07-141-1/+0
| | | | |
| * | | | Merge branch 'master' into nonce-trackerfrankiebee2017-07-135-36/+40
| |\ \ \ \
| * | | | | Fix test to match behaviorfrankiebee2017-07-132-2/+2
| | | | | |
| * | | | | mv updateAndApproveTx to txControllerfrankiebee2017-07-131-3/+7
| | | | | |
| * | | | | use new nodeifyfrankiebee2017-07-132-44/+21
| | | | | |
| * | | | | Use txParamsfrankiebee2017-07-121-4/+4
| | | | | |
| * | | | | Merge branch 'master' into nonce-trackerfrankiebee2017-07-127-21/+113
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'nonce-tracker' of https://github.com/MetaMask/metamask-plugin ↵frankiebee2017-07-1225-129/+689
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into nonce-tracker
| | * | | | | | test - tx controller - fix promise handlingkumavis2017-07-081-5/+2
| | | | | | | |
| | * | | | | | test - tx-controller - stub block-tracker methodkumavis2017-07-081-1/+1
| | | | | | | |
| | * | | | | | Merge branch 'master' into nonce-trackerkumavis2017-07-0825-123/+686
| | |\ \ \ \ \ \
| * | | | | | | | remove irrelevan codefrankiebee2017-07-121-1/+0
| |/ / / / / / /
| * | | | | | | clean up unused code from old noncelockfrankiebee2017-07-061-2/+0
| | | | | | | |
| * | | | | | | fix nonce calculation orderfrankiebee2017-07-061-6/+7
| | | | | | | |
| * | | | | | | nonce-tracker: only check transactions that are not supposed to be ignoredfrankiebee2017-06-282-7/+15
| | | | | | | |
| * | | | | | | calculate nonce based on local pending txs w/o error state.frankiebee2017-06-281-1/+10
| | | | | | | |
| * | | | | | | Merge branch 'master' into nonce-trackerfrankiebee2017-06-2826-56/+507
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into nonce-trackerfrankiebee2017-06-225-16/+7
| |\ \ \ \ \ \ \ \
| * | | | | | | | | fix nonceTrackerfrankiebee2017-06-223-58/+25
| | | | | | | | | |
| * | | | | | | | | add a test for #getNonceLockfrankiebee2017-06-223-6/+63
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into nonce-trackerfrankiebee2017-06-175-38/+92
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | remove irrelevant testfrankiebee2017-06-171-5/+0
| | | | | | | | | | |
| * | | | | | | | | | Fix test to call donefrankiebee2017-06-161-7/+8
| | | | | | | | | | |
| * | | | | | | | | | transaction controller - use nonce-trackerkumavis2017-06-153-36/+63
| | | | | | | | | | |
| * | | | | | | | | | introduce nonce-trackerkumavis2017-06-151-0/+49
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #1775 from MetaMask/BlacklistFasterkumavis2017-07-142-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Redirect from malicious sites faster
| * | | | | | | | | | | Redirect from malicious sites fasterDan Finlay2017-07-142-1/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #1771 from MetaMask/addNonceErrToErrLIstkumavis2017-07-133-0/+42
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add nonce err to err list
| * | | | | | | | | | | limit the range for retryCountfrankiebee2017-07-131-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | write a migration for resubmit tx's to get put back into a submitted statefrankiebee2017-07-132-0/+41
| | | | | | | | | | | |
| * | | | | | | | | | | add "nonce too low" to the ignored errs list for tx retrysfrankiebee2017-07-131-0/+1
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #1770 from MetaMask/Version-3.9.0kumavis2017-07-132-3/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Version 3.9.0
| * | | | | | | | | | | Remove css referencev3.9.0Dan Finlay2017-07-131-2/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Version 3.9.0Dan Finlay2017-07-132-1/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #1769 from MetaMask/UpdateMetadatakumavis2017-07-131-2/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update eth-contract-metadata on build
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into UpdateMetadataDan Finlay2017-07-136-2/+24
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update eth-contract-metadata on buildDan Finlay2017-07-131-2/+3
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1765 from MetaMask/Version-3.8.6kumavis2017-07-132-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | Version 3.8.6
| * | | | | | | | | | | Merge branch 'master' into Version-3.8.6Dan Finlay2017-07-136-2/+25
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1768 from MetaMask/AddBlacklistkumavis2017-07-136-2/+24
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | Add first version of phishing site warning
| * | | | | | | | | | | Refresh blacklist before distDan Finlay2017-07-131-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Correct github linkDan Finlay2017-07-131-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Bump node versionDan Finlay2017-07-131-1/+1
| | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 20:51:39 +0800