aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Cleanup before rebase on NewUI - need new version of AccountDropdownssdtsui2017-08-071-11/+2
|
* Allow clicks on account view to enable sidebar, not just burgersdtsui2017-08-071-4/+4
|
* Refactor account name css - mobile viewssdtsui2017-08-074-12/+12
|
* Add sidebar click handler to overlaysdtsui2017-08-071-2/+11
|
* Refactor app-header css, including box shadow and z-indexsdtsui2017-08-074-27/+46
|
* Add fine css tweaks to hero balance - laptopsdtsui2017-08-072-21/+11
|
* Adjust hero balance on mobilesdtsui2017-08-071-26/+31
|
* Adjust size of buttons for 576-780+px rangesdtsui2017-08-071-19/+5
|
* Fix font size of eth display for 576-780px vwsdtsui2017-08-072-3/+20
|
* Normalize sidebar dimensions and adjust hero button responsivenesssdtsui2017-08-074-26/+57
|
* Implement hero balance UI, mobilesdtsui2017-08-073-51/+92
|
* Position account display and burger in mobile tx viewsdtsui2017-08-072-7/+42
|
* Disable debug stylessdtsui2017-08-071-17/+17
|
* Move remaining debug, fonts, reset, and transitions into inverted trianglesdtsui2017-08-0713-392/+343
|
* Move debug and colors to itcsssdtsui2017-08-073-5/+33
|
* Ignore all compiled css, track only scsssdtsui2017-08-071-2/+2
|
* Remove output foldersdtsui2017-08-073-1177/+1
|
* Clean up gulpfilesdtsui2017-08-071-22/+7
|
* Use 4.x pattern for watching scsssdtsui2017-08-071-2/+5
|
* Ignore itcss sourcemapssdtsui2017-08-071-0/+3
|
* Remove unncessary sourcemaps from css output/sdtsui2017-08-0714-1264/+0
|
* Organize app components scsssdtsui2017-08-0719-818/+2115
|
* Organize app componentssdtsui2017-08-073-133/+68
|
* Move generic button components and body styles to components and generic, ↵sdtsui2017-08-079-311/+358
| | | | respectively
* Move old colors intro settings/variablessdtsui2017-08-072-8/+18
|
* Add inverted triangle css (itcss) folder structuresdtsui2017-08-0714-0/+14
|
* Cleanup css and gulpfile post-migrationsdtsui2017-08-075-1203/+16
|
* Migrate from css to scss + autoprefixersdtsui2017-08-0712-8/+2402
|
* Add Roboto without hooking it up via importsdtsui2017-08-0518-0/+0
|
* Add rough layout for flat layout tx details, add notes for breakpointssdtsui2017-08-032-23/+56
|
* Implement 'clear buttons' for tx viewsdtsui2017-08-034-47/+57
|
* Fix color for large password inputsdtsui2017-08-031-1/+1
|
* Add notes for @Zanibar, with props.isUnlocked and currentView.name logssdtsui2017-08-031-0/+4
|
* Fix background color for lock screensdtsui2017-08-031-0/+1
|
* Isolate routing logic for isUnlocked, remove stray logssdtsui2017-08-036-21/+49
|
* Finalize sidebar dimensionssdtsui2017-08-033-31/+33
|
* Finalize height for main screens, excluding sidebarsdtsui2017-08-033-6/+5
|
* Finalize width of main container for all viewportssdtsui2017-08-031-12/+19
|
* Make mobile view flush with headersdtsui2017-08-032-20/+30
|
* Add note for styling buttonssdtsui2017-08-031-0/+2
|
* Isolate container component, add refactor notessdtsui2017-08-032-19/+57
|
* Adjust header spacing for 500px and 900px heightssdtsui2017-08-032-14/+5
|
* Adjust sidebar transition using @cjeria\'s feedbacksdtsui2017-08-032-10/+16
|
* Ensure app-header is rendered in responsive layoutsdtsui2017-08-032-2/+3
|
* Cleanup send, move send token into separate func to make room for send ETHsdtsui2017-08-032-35/+220
|
* Add Ethereum Logosdtsui2017-08-031-0/+11
|
* Move overlay out of transition areasdtsui2017-08-031-17/+18
|
* Hook up css animationsdtsui2017-08-033-41/+75
|
* Add notes for overlay click actionsdtsui2017-08-031-0/+1
|
* Implement custom sidebar, with close buttonsdtsui2017-08-033-13/+82
|
* Integrate slideout menu with tx viewsdtsui2017-08-034-16/+46
|
* Hook up responsive sidebarsdtsui2017-08-034-3/+27
|
* Add dependejncy: react-burger-menusdtsui2017-08-031-0/+1
|
* Add burger icon and phone-visible media queriessdtsui2017-08-032-4/+9
|
* Make wallet view visible iff vw above 575pxsdtsui2017-08-034-5/+25
|
* Hook up send button to Send Token screensdtsui2017-08-011-1/+12
|
* Implement mobile-friendly responsive layout with flex wrapsdtsui2017-08-014-4/+16
|
* Reset popup to 350x500, old form factor as advised by @Zanibassdtsui2017-08-011-1/+1
|
* Add rough layout for tx list itemssdtsui2017-08-011-0/+60
|
* Add tx-view content divider componentsdtsui2017-08-011-5/+6
|
* Add hyperscript for tx-view tabssdtsui2017-08-011-9/+27
|
* Add TxView, use width percentages instead of flex-grow for layoutsdtsui2017-08-013-5/+61
|
* Adjust button styles to left align with wallet textsdtsui2017-08-011-7/+4
|
* Use DIN OT in wallet viewsdtsui2017-08-012-6/+13
|
* Add new fonts from @cjeria: DIN Next and DIN OTsdtsui2017-08-0112-0/+0
|
* Adjust popup size to 545x450; refactor wallet view to fitsdtsui2017-08-013-61/+29
|
* Isolate wallet-content-display componentsdtsui2017-07-312-2/+62
|
* Add layout for Buy and Send buttonssdtsui2017-07-311-1/+44
|
* Add hyperscript for wallet display componentsdtsui2017-07-311-4/+48
|
* Center account name and dropdownssdtsui2017-07-312-8/+7
|
* Add note for later on isolating componentssdtsui2017-07-311-1/+1
|
* Add box shadow to main containersdtsui2017-07-311-0/+1
|
* Add containers for wallet view and dropdown UIsdtsui2017-07-312-3/+84
|
* Add layout for main container elementssdtsui2017-07-312-12/+49
|
* Remove old header spacesdtsui2017-07-311-11/+0
|
* Set font-size on body of popup.html, for responsivenesssdtsui2017-07-311-1/+1
|
* Adjust dimensions of popup.html and app bar to matchsdtsui2017-07-313-3/+3
|
* Adjust button styles for Send Token screensdtsui2017-07-312-1/+2
|
* Adjust copy in send token confirmation screensdtsui2017-07-301-2/+2
|
* Move action buttons out of send token container, tweak stylessdtsui2017-07-301-38/+40
|
* Simplify btn-green colorssdtsui2017-07-303-4/+4
|
* Enhance button and input css reset to protect from user agent stylesheetsdtsui2017-07-301-0/+4
|
* Add rounded background to total token, with minor styling tweakssdtsui2017-07-304-29/+180
|
* Add note to self, for future code cleanupsdtsui2017-07-301-1/+7
|
* Add content boxes to pendingTx, prep for reusabilitysdtsui2017-07-301-330/+179
|
* Cleanup unnecessary pending tx-switching logicsdtsui2017-07-301-60/+19
|
* [WIP] Isolate form logic from rest of confirmation UIsdtsui2017-07-301-22/+27
|
* Clean up send screensdtsui2017-07-301-2/+6
|
* Center action buttons, add minor style adjustmentssdtsui2017-07-302-58/+88
|
* Center send token content; hook up 'Next' and 'Cancel' buttonssdtsui2017-07-303-173/+203
|
* Add high-level css layout for Send Tokensdtsui2017-07-301-23/+78
|
* Add responsive container; add send token copysdtsui2017-07-302-93/+53
|
* Add token logo to send screensdtsui2017-07-302-2/+32
|
* Rearrange header components: closer to redesigned UIsdtsui2017-07-301-31/+18
|
* Add for use in main headersdtsui2017-07-302-1/+3
|
* [WIP] Propose more scaleable color managementsdtsui2017-07-301-0/+2
|
* 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 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
| | |\ | | |/ | |/|
| | * Live update blacklist from InfuraDan Finlay2017-07-275-13/+17
| | |
| | * Merge branch 'master' into i1805-LiveBlacklistUpdatingDan Finlay2017-07-275-10/+21
| | |\
| | * | Begin implementing live-updating blacklist, not working yetDan Finlay2017-07-273-8/+52
| | | |
* | | | Merge branch 'master' into NewUIDan Finlay2017-07-2816-58/+180
|\| | |
| * | | 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
| | | |
| * | | 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
| | |
| * | 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
| |/
* | 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
| |\|
| | * 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
| | | | | | | | | | |