aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix testCsaba Solya2018-02-231-1/+2
* add negative decrypt testCsaba Solya2018-02-231-0/+20
* fix testsCsaba Solya2018-02-231-6/+20
* make keyFromPassword privateCsaba Solya2018-02-231-3/+3
* adding testsCsaba Solya2018-02-231-0/+66
* Merge branch 'master' into edge-supportCsaba S2018-02-22382-3802/+42016
|\
| * Merge pull request #3050 from MetaMask/uatDan Finlay2018-02-22382-3802/+42016
| |\
| | * Merge pull request #3306 from danjm/MM-805-send-from-tab-popup-fixThomas Huang2018-02-221-1/+11
| | |\
| | | * Prevents new transaction from generating popup when metamask is open in an ac...Dan2018-02-221-1/+11
| | * | Merge pull request #3288 from MetaMask/uat-masterDan Finlay2018-02-226-4/+24
| | |\ \
| | | * | Merge branch 'master' into uat-masterDan Finlay2018-02-226-4/+24
| | |/| | | | |/ / | |/| |
| | * | Merge pull request #3296 from danjm/MM-806-new-ui-first-time-import-seed-in-p...Thomas Huang2018-02-2211-36/+109
| | |\ \ | | | |/ | | |/|
| | | * Remove output fileThomas Huang2018-02-211-1889/+0
| | | * Use same logic for downloading state logs in the old/uatThomas Huang2018-02-211-1/+7
| | | * Merge branch 'MM-806-new-ui-first-time-import-seed-in-popup' of https://githu...Thomas Huang2018-02-217-37/+31
| | | |\
| | | | * Fix old-ui active notices width.Dan2018-02-211-1/+3
| | | | * Render loading inside notice screen, and don't set isLoading from unMarkPassw...Dan2018-02-213-32/+24
| | | | * Fix promise constructionDan Finlay2018-02-211-1/+1
| | | | * Add 8MM gas limit default to send screenDan Finlay2018-02-211-1/+2
| | | | * Try fixing notice screen synchronous state callDan Finlay2018-02-211-2/+1
| | | * | Merge branch 'MM-806-new-ui-first-time-import-seed-in-popup' of https://githu...Thomas Huang2018-02-210-0/+0
| | | |\|
| | | | * Temporarily disable loading indicator.Dan2018-02-211-3/+4
| | | * | Temporarily disable loading indicator.Dan2018-02-212-3/+1893
| | | |/
| | | * Fix variable spelling error.Dan2018-02-212-7/+8
| | | * Fix Import Existing DEN in popup New UI first time flow.Dan2018-02-204-9/+80
| | |/
| | * Merge pull request #3286 from danjm/uat-version-bumpkumavis2018-02-171-1/+1
| | |\
| | | * Bump uat version to 4.0.12Dan2018-02-171-1/+1
| | |/
| | * Ensures that mascara initialize screen is not shown in popup. (#3279)Dan J Miller2018-02-171-1/+4
| | * Merge pull request #3200 from alextsg/cb-703kumavis2018-02-1720-50/+68
| | |\
| | | * Remove accessing PropTypes from main React packageAlexander Tseung2018-02-0720-50/+68
| | * | Merge pull request #3261 from MetaMask/uat-oldui-compatibilitykumavis2018-02-164-5/+6
| | |\ \
| | | * | Make oldui compatible with newUI style changesThomas Huang2018-02-164-5/+6
| | * | | [NewUI] Adds the mascara first time flow to betaUI extension (#3257)Dan J Miller2018-02-164-7/+10
| | |/ /
| | * | Merge pull request #3240 from MetaMask/AddSassToDevDepsDan Finlay2018-02-141-0/+1
| | |\ \
| | | * | Add node-sass to dev dependenciesDan Finlay2018-02-141-0/+1
| | |/ /
| | * | Merge pull request #3231 from danjm/MM-744-restore-from-seed-fixDan J Miller2018-02-142-3/+4
| | |\ \
| | | * | Remove isInBrowser method and use environment-type.jsDan2018-02-142-22/+4
| | | * | Only open a new window on restore from seed if in extension view.Dan2018-02-143-3/+22
| | * | | Merge pull request #3239 from MetaMask/uat-nextDan J Miller2018-02-1459-281/+2143
| | |\ \ \
| | | * \ \ Merge pull request #3209 from danjm/MM-634-newui-reset-accountDan Finlay2018-02-146-35/+204
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Add reset account button to new UI.Dan2018-02-096-35/+204
| | | * | | Merge pull request #3216 from danjm/MM-666-try-beta-link-unlock-privacy-screensDan Finlay2018-02-142-5/+42
| | | |\ \ \
| | | | * | | Try beta link on unlock and privacy screens.Dan2018-02-092-5/+42
| | | | |/ /
| | | * | | Updates the styling of confirm send ether and token screens. (#3235)Dan J Miller2018-02-133-26/+20
| | | * | | Send screen style updates. (#3234)Dan J Miller2018-02-134-9/+52
| | | * | | Remove chrome focus outline for mouse users. (#3230)Dan J Miller2018-02-134-1/+40
| | | * | | Fix exception thrown in selected token tx list with shapeshift txs (#3215)Alexander Tseung2018-02-091-3/+3
| | | * | | Fixes shapeshift txs so that they render in tx list. (#3208)Dan J Miller2018-02-092-36/+28
| | | |/ /
| | | * | Merge pull request #3206 from danjm/merge-uat-to-uatnext-feb072019Dan J Miller2018-02-0818-26/+269
| | | |\ \
| | | | * \ Merge branch 'uat' into uat-nextDan2018-02-0818-26/+269
| | | | |\ \ | | | |_|/ / | | |/| | |
| | * | | | Merge pull request #3203 from danjm/merge-master-to-uat-feb72018Dan J Miller2018-02-0818-26/+269
| | |\ \ \ \
| | | * | | | Point add-token unit test to old-ui component.Dan2018-02-081-1/+1
| | | * | | | Merge branch 'master' into uatDan2018-02-0818-26/+269
| | |/| | | |
| | | | * | | Make blockies icon round to match identicons (#3205)Alexander Tseung2018-02-082-5/+5
| | | | |/ /
| | | | * | [NewUI] Opens to full screen when restoring from seed. (#3201)Dan J Miller2018-02-087-24/+65
| | | | * | Update modal header design on send screen (#3196)Alexander Tseung2018-02-074-67/+134
| | | | * | Fix alignment of ellipsis and address in wallet view. (#3198)Dan J Miller2018-02-073-2/+3
| | | | |/
| | | | * Remove duplicate token balance on uat next. (#3195)Dan J Miller2018-02-071-2/+0
| | | | * Integration tests for signature requests confirmations. (#3194)Dan J Miller2018-02-075-2/+292
| | | | * Add functional integration testing to Add Token flow (#3189)Alexander Tseung2018-02-065-5/+304
| | | | * Wallet view supports screen sizes between 576px and 667px (#3193)Dan J Miller2018-02-065-24/+70
| | | | * Change styling of Import Account with Seed Phrease (#3182)Alexander Tseung2018-02-063-29/+44
| | | | * [NewUI] Use tooltip for copy to clipboard helper text on main screen. (#3120)Dan J Miller2018-02-017-17/+136
| | | | * [NewUI] Updates capitalization and alignment for the import account screen. (...Dan J Miller2018-02-013-11/+35
| | | | * [NewUI] Set default new account name as placeholder, but not value (#3121)Dan J Miller2018-02-011-5/+8
| | | | * Fix bug stemming from erroneously persistant unlock failure error message. (#...Dan J Miller2018-01-302-0/+15
| | | | * Functional Integration Tests for send ether flow. (#3119)Dan J Miller2018-01-304-0/+670
| | | |/ | | |/|
| | * | Merge branch 'master' into uatThomas Huang2018-01-241-1/+0
| | |\ \
| | * \ \ Merge pull request #3069 from tmashuang/uatDan J Miller2018-01-2411-27/+75
| | |\ \ \
| | | * | | Merge branch 'master' into uatThomas2018-01-237-7/+43
| | | * | | Revert integration to oldUiThomas2018-01-231-18/+23
| | | * | | String interpolate version in settingsThomas2018-01-231-1/+1
| | | * | | Remove duplicate eth-contract-metadataThomas2018-01-231-1/+1
| | | * | | Add ExtensionPlatform = 'development' to mockUiThomas2018-01-232-0/+7
| | |/ / /
| | * | | Merge pull request #3049 from chikeichan/newmasterChi Kei Chan2018-01-2014-73/+208
| | |\ \ \
| | | * | | update yarn.lockChi Kei Chan2018-01-201-24/+99
| | | * | | Merge branch 'uat' into newmasterChi Kei Chan2018-01-20352-3709/+39827
| | | |\ \ \
| | * | | | | Get version from manifest instead of hard coding in New UI info page.Dan2018-01-201-1/+3
| | | |/ / / | | |/| | |
| | * | | | 4.0.10kumavis2018-01-191-1/+1
| | * | | | Fix transaction list font sizes, paddingAlexander Tseung2018-01-192-17/+7
| | * | | | Merge pull request #3024 from alextsg/cb-529Kevin Serrano2018-01-194-3/+26
| | |\ \ \ \
| | | * | | | Fix lint errorsAlexander Tseung2018-01-181-1/+1
| | | * | | | Update popout to fullscreen iconAlexander Tseung2018-01-183-2/+25
| | * | | | | [NewUI] Send screen gas loading fixes (#3027)Dan J Miller2018-01-183-27/+25
| | |/ / / /
| | * | | | Show now tokens by default and improve search on add token screen.Dan2018-01-181-5/+10
| | * | | | Fix tx-list, confirmation screen stylingAlexander Tseung2018-01-184-13/+18
| | * | | | Merge pull request #3005 from alextsg/cb-385Chi Kei Chan2018-01-182-1/+4
| | |\ \ \ \
| | | * | | | Fix rendering QR code in old UI, hide unnecessary back buttonAlexander Tseung2018-01-172-1/+4
| | * | | | | Merge pull request #3007 from alextsg/uat-master-011618Chi Kei Chan2018-01-1824-84/+395
| | |\ \ \ \ \
| | | * | | | | Fix merge conflictsAlexander Tseung2018-01-171-5/+14
| | | * | | | | Merge branch 'uat' into uat-master-011618Alexander Tseung2018-01-17351-3712/+39761
| | | |\| | | |
| | * | | | | | Readjust gas fees when switching networks on the send screenAlexander Tseung2018-01-172-22/+44
| | * | | | | | Vertically centers the text of the new ui modal header. (#2987)Dan J Miller2018-01-171-0/+1
| | * | | | | | Adding one or more tokens sets the selected token before returning the user t...Dan J Miller2018-01-172-0/+8
| | | |/ / / / | | |/| | | |
| | * | | | | [NewUI-flat] Fix gulp build (#2975)Dan J Miller2018-01-163-14/+90
| | * | | | | Restore display of all unconfirmed transactions.Dan2018-01-161-34/+34
| | * | | | | Fix send screen value inputAlexander Tseung2018-01-161-3/+11
| | * | | | | Fix Hide Token modal styling, popup positioningAlexander Tseung2018-01-164-25/+15
| | * | | | | Merge pull request #2964 from alextsg/cb-505cDan Finlay2018-01-161-1/+1
| | |\ \ \ \ \
| | | * | | | | Move blockies option to the bottom of SettingsAlexander Tseung2018-01-151-1/+1
| | * | | | | | [NewUI] Place all users of extension into old UI (disable auto adding). (#2946)Dan J Miller2018-01-163-26/+79
| | * | | | | | Fix confirm Add Token button orderAlexander Tseung2018-01-131-4/+4
| | * | | | | | Fix Add Token button order, stylingAlexander Tseung2018-01-132-14/+16
| | * | | | | | Fix input box padding and select highlight in new account create and import p...Dan2018-01-132-1/+11
| | * | | | | | New add account page with create and import options.Dan2018-01-1313-95/+475
| | * | | | | | Merge pull request #2928 from alextsg/cb-388Chi Kei Chan2018-01-1324-234/+284
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'uat' into cb-388Chi Kei Chan2018-01-130-0/+0
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Merge branch 'uat' into cb-388Chi Kei Chan2018-01-1324-315/+758
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Fix styling in initializationAlexander Tseung2018-01-133-7/+21
| | | |/ / / / / | | |/| | | | |
| | * | | | | | [NewUI-flat] New deposit ether modal UI. (#2642)Dan J Miller2018-01-1314-318/+717
| | * | | | | | Fix margin styling for name and address in account detail section. (#2790)Dan J Miller2018-01-122-3/+4
| | * | | | | | [NewUI] Build mascara with uglification and gzipping. (#2735)Dan J Miller2018-01-124-1/+15
| | * | | | | | Fix logging out of old UI causing infinite spinner (#2914)Alexander Tseung2018-01-122-2/+6
| | * | | | | | Fix padding of a hovered tx-list-item (#2859)Dan J Miller2018-01-121-1/+1
| | | * | | | | Fix token balance colorAlexander Tseung2018-01-121-1/+3
| | | * | | | | Fix lint errorsAlexander Tseung2018-01-121-1/+0
| | | * | | | | Change styling for network dropdownAlexander Tseung2018-01-122-58/+25
| | | * | | | | Update styling for buttons, font weightsAlexander Tseung2018-01-1216-125/+83
| | | * | | | | Update main view stylingAlexander Tseung2018-01-1113-85/+198
| | |/ / / / /
| | * | | | | 4.0.9kumavis2018-01-091-1/+1
| | * | | | | ui - fix font path namekumavis2018-01-091-2/+2
| | * | | | | Merge pull request #2848 from MetaMask/NewUI-flatAlexander Tseung2018-01-0412-1313/+2204
| | |\ \ \ \ \
| | | * \ \ \ \ Merge pull request #2845 from alextsg/NewUI-flat-4.0.5cAlexander Tseung2018-01-0410-14/+115
| | | |\ \ \ \ \
| | | | * | | | | Fix merge conflictAlexander Tseung2018-01-041-1/+0
| | | | * | | | | Merge branch 'NewUI-flat' into NewUI-flat-4.0.5cAlexander Tseung2018-01-04338-3279/+38277
| | | | |\ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Fix sign typed dataAlexander Tseung2017-12-302-1298/+2088
| | | * | | | | | Fix mascara first time flow button colorsAlexander Tseung2017-12-301-3/+3
| | * | | | | | | Merge pull request #2799 from MetaMask/NewUI-flatAlexander Tseung2017-12-23193-659/+21414
| | |\| | | | | |
| | | * | | | | | Merge pull request #2798 from alextsg/NewUI-flat-4.0.5Alexander Tseung2017-12-233-8/+1
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge branch 'NewUI-flat' into merge-masterAlexander Tseung2017-12-231-1/+1
| | | | |\ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Update manifest.json version from 4.0.4 to 4.0.5 (#2797)Alexander Tseung2017-12-231-1/+1
| | | | * | | | | | Merge branch 'NewUI-flat' into merge-masterAlexander Tseung2017-12-23337-2146/+36353
| | | | |\ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Track usage of old and new UI (#2794)Alexander Tseung2017-12-239-17/+125
| | | * | | | | | | [NewUI] Fixes tests and sends user to NewUI after registering. (#2788)Dan J Miller2017-12-226-8/+12
| | | * | | | | | | Merge pull request #2785 from danjm/merge-master-to-newUI-flat-dec20Chi Kei Chan2017-12-2120-79/+1114
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20Chi Kei Chan2017-12-210-0/+0
| | | | |\ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20Chi Kei Chan2017-12-218-74/+98
| | | | |\ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | Clone transaction while editing instead of mutating object from state.Dan2017-12-211-6/+7
| | | * | | | | | | | Add constanst for token transfer function signature.Dan2017-12-212-1/+5
| | | * | | | | | | | Lint fixes.Dan2017-12-214-6/+2
| | | * | | | | | | | Adds updateTransaction to background and used it to update after editing in s...Dan2017-12-218-101/+85
| | | * | | | | | | | Canceled, edited transactions show edited amount.Dan2017-12-215-2/+41
| | | | * | | | | | | Merge branch 'master' into NewUI-flatDan2017-12-2120-79/+1114
| | | |/| | | | | | |
| | | * | | | | | | | [NewUI] Hide UI toggle in mascara (#2772)Dan J Miller2017-12-214-19/+23
| | | * | | | | | | | Hide fiat values on account details screen when eth/token value is 0.Dan2017-12-213-3/+8
| | | * | | | | | | | Hides the sidebar after the an account menu actions changes the screen behind...Dan2017-12-211-0/+6
| | | * | | | | | | | Fix edit to field bug. (#2738)Dan J Miller2017-12-131-6/+7
| | | * | | | | | | | Remove inline style.Dan2017-12-133-4/+4
| | | * | | | | | | | Make transaction list and item more flexible.Dan2017-12-132-4/+4
| | | * | | | | | | | Flex account-data-subsectionDan2017-12-133-19/+20
| | | * | | | | | | | Fix old ui width in mobile and extension.Dan2017-12-132-24/+21
| | | * | | | | | | | Fix height of login screenDan2017-12-131-27/+25
| | | * | | | | | | | Fix isMascara and update yarn.lockChi Kei Chan2017-12-132-290/+464
| | | * | | | | | | | Substitute isMascara check for explicit check if user is on mobile browser.Dan2017-12-132-13/+2
| | | * | | | | | | | Hide open in browser button on mobile (but still show on extension); adds a f...Dan2017-12-133-3/+15
| | | * | | | | | | | Adds button for opening app in main browser window in extension.Dan2017-12-134-0/+29
| | | * | | | | | | | Delete uneeded files from old-ui.Dan2017-12-139-2106/+0
| | | * | | | | | | | Merge pull request #2639 from alextsg/cb-372Chi Kei Chan2017-12-085-23/+28
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch 'NewUI-flat' into cb-372Chi Kei Chan2017-12-080-0/+0
| | | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Merge branch 'NewUI-flat' into cb-372Chi Kei Chan2017-12-08162-152/+21152
| | | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge pull request #2697 from danjm/MM-333-auto-add-users-to-new-UIChi Kei Chan2017-12-08138-43/+20783
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UIChi Kei Chan2017-12-080-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UIChi Kei Chan2017-12-0828-109/+369
| | | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Update max amount behaviour to meet new specs.Dan2017-12-076-15/+55
| | | * | | | | | | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-12-073-23/+88
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Merge branch 'master' into NewUI-flat-merge-with-masterDan2017-12-0719-71/+226
| | | | | * | | | | | | | | User is automatically added to new UI if they meet conditions at time of login.Dan2017-12-072-3/+47
| | | | | * | | | | | | | | Show user notifications after switch between UIsDan2017-12-058-3/+185
| | | | | * | | | | | | | | Update newUI UI for switching back to old UI.Dan2017-12-052-8/+24
| | | | | * | | | | | | | | Lint fixDan2017-12-052-3/+3
| | | | | * | | | | | | | | Css selected in background based on betaUI state.Dan2017-12-051-6/+15
| | | | | * | | | | | | | | New-ui actions accomodates old-ui.Dan2017-12-052-8/+11
| | | | | * | | | | | | | | Use newui actions in old-uiDan2017-12-0526-25/+28
| | | | | * | | | | | | | | Add UI selectionDan2017-12-0511-51/+136
| | | | | * | | | | | | | | Add old-ui directoryDan2017-12-05122-0/+20398
| | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | | | * | | | | | | | Update font weights to 300, remove animation from network dropdown, fix netwo...Alexander Tseung2017-12-025-23/+28
| | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge pull request #2615 from jpclark/NewUI-flatThomas Huang2017-11-2910-28/+494
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Remove useBlockie in props for renderThomas Huang2017-11-291-1/+1
| | | | * | | | | | | | | Fixes changes requested in pullrequestreview-79088534Jason Clark2017-11-273-2/+4
| | | | * | | | | | | | | more eslint fixesJason Clark2017-11-262-2/+2
| | | | * | | | | | | | | adding blockies lib to eslint ignore so it doesn't blow up the style checker ...Jason Clark2017-11-261-1/+2
| | | | * | | | | | | | | making eslint happyJason Clark2017-11-263-7/+8
| | | | * | | | | | | | | fixing blockies display issuesJason Clark2017-11-262-5/+9
| | | | * | | | | | | | | swapped out ethereum-blockies lib for MEW blockies library, tightened up iden...Jason Clark2017-11-264-86/+413
| | | | * | | | | | | | | tweaking stylingJason Clark2017-11-252-9/+27
| | | | * | | | | | | | | incremental commit of working blockie componentJason Clark2017-11-253-18/+57
| | | | * | | | | | | | | toggle wired up to preferences property storeJason Clark2017-11-256-26/+47
| | | | * | | | | | | | | incremental commitClark, Jason (Contractor)2017-11-247-5/+58
| | | * | | | | | | | | | Merge pull request #2618 from MetaMask/NewUI-flat-update-depsDan Finlay2017-11-296-17/+27
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Update babelify to 8.0.0Thomas Huang2017-11-281-1/+1
| | | | * | | | | | | | | Update react, react-dom, and react-test-renderer to 15.6.2Thomas Huang2017-11-271-3/+3
| | | | * | | | | | | | | Update ethjs-query to v0.3.1Thomas Huang2017-11-271-1/+1
| | | | * | | | | | | | | Update Qunit to QunitJS v2.4.1Thomas Huang2017-11-271-1/+1
| | | | * | | | | | | | | Update to Enzyme 3.2.0Thomas Huang2017-11-266-11/+21
| | | |/ / / / / / / / /
| | | * | | | | | | | | Remove unneeded type castingDan Finlay2017-11-211-1/+1
| | | * | | | | | | | | Fix bug where gas param was not a stringDan Finlay2017-11-212-3/+3
| | * | | | | | | | | | Merge pull request #2591 from MetaMask/NewUI-flatChi Kei Chan2017-11-1640-180/+780
| | |\| | | | | | | | |
| | | * | | | | | | | | Merge pull request #2590 from MetaMask/merge-masterChi Kei Chan2017-11-1610-17/+53
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Version BumpChi Kei Chan2017-11-162-1/+5
| | | | * | | | | | | | | Merge branch 'master' into merge-masterChi Kei Chan2017-11-168-16/+48
| | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge pull request #2587 from danjm/MM-281-currencyinput-in-gas-estimatorDaniel Tsui2017-11-162-5/+8
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Gas customzier does not consider amount when sending tokens.Dan2017-11-161-1/+1
| | | | * | | | | | | | | | Use currency input component in input number, to improve input behaviour in g...Dan2017-11-161-4/+7
| | | |/ / / / / / / / / /
| | | * | | | | | | | | | Show tokens with zero balanceAlexander Tseung2017-11-151-4/+1
| | | * | | | | | | | | | Create single action for updating all of send in redux state.Dan2017-11-155-13/+38
| | | * | | | | | | | | | Allow editing of token transactions.Dan2017-11-152-11/+91
| | | * | | | | | | | | | Fix lint errors.Dan2017-11-154-18/+15
| | | * | | | | | | | | | Allow editing of send ether.Dan2017-11-155-23/+131
| | | * | | | | | | | | | Improve variable name.Dan2017-11-141-2/+2
| | | * | | | | | | | | | Deposit button shows link to faucet on testnet networks.Dan2017-11-141-15/+23
| | | * | | | | | | | | | Cursor pointer and hover background on from and to dropdown items.Dan2017-11-114-0/+15
| | | * | | | | | | | | | Focus amount input when click anywhere in amount field containerDan2017-11-112-0/+4
| | | * | | | | | | | | | Rounding of vals < 0.01 in currency display consistent with master.Dan2017-11-112-2/+3
| | | * | | | | | | | | | LintingThomas Huang2017-11-115-9/+9
| | | * | | | | | | | | | Network loading does not block network loading.Dan2017-11-105-16/+27
| | | * | | | | | | | | | darker backdrop style for modalcjeria2017-11-101-1/+1
| | | * | | | | | | | | | Merge pull request #2549 from danjm/NewUI-flat-send-amount-fixesDaniel Tsui2017-11-082-20/+29
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Calculate max amount for send ether based on minimum gas total.Dan2017-11-082-10/+1
| | | | * | | | | | | | | | Fix amount max for sending token.Dan2017-11-082-10/+28
| | | |/ / / / / / / / / /
| | | * | | | | | | | | | Merge pull request #2510 from danjm/NewUI-flat-token-balanceDaniel Tsui2017-11-0817-82/+387
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Add currency-input component to correct send amount behaviour and move curren...Dan2017-11-083-32/+103
| | | | * | | | | | | | | | Lint fixes.Dan2017-11-075-15/+3
| | | | * | | | | | | | | | Allow sending 0 eth or tokensDan2017-11-071-3/+3
| | | | * | | | | | | | | | Set gas price allows for WEI precision.Dan2017-11-074-10/+30
| | | | * | | | | | | | | | Insufficient balance warning in gas customizer works for send tokenDan2017-11-071-3/+1
| | | | * | | | | | | | | | Adds max amount feature for send tokenDan2017-11-071-5/+12
| | | | * | | | | | | | | | Adds max amount feature for send-etherDan2017-11-075-2/+65
| | | | * | | | | | | | | | Token balance in send state; validating sufficient tokens, validation updates...Dan2017-11-0711-33/+191
| | | |/ / / / / / / / / /
| | | * | | | | | | | | | Merge pull request #2530 from MetaMask/uatChi Kei Chan2017-11-0354-1019/+952
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fixes width of from and to dropdowns in extension and on mobile views.Dan2017-11-032-2/+3
| | * | | | | | | | | | | | Merge pull request #2518 from MetaMask/mascara-first-screenFrankie2017-11-085-54/+110
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Merge remote-tracking branch 'origin/uat' into mascara-first-screenfrankiebee2017-11-0864-1161/+1296
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Update classnames for integration tests and add output/index.css to integrati...Dan2017-11-033-38/+25
| | * | | | | | | | | | | | Get current NewUI-flat tests working.Dan2017-11-036-137/+113
| | * | | | | | | | | | | | Merge pull request #2519 from danjm/NewUI-flat-lintfixesThomas Huang2017-11-0357-986/+1158
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | More lint fixesDan2017-11-0233-115/+108
| | | * | | | | | | | | | | | Lint fixes for NewUI-flat.Dan2017-11-0235-726/+703
| | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Add utility for getting token data; get token data in tx-list even if token h...Dan2017-10-284-29/+89
| | | * | | | | | | | | | | Provide default new account nameAlexander Tseung2017-10-271-63/+78
| | | * | | | | | | | | | | Fix Settings/Info screen being visible on logout (#2490)Alexander Tseung2017-10-272-6/+43
| | | * | | | | | | | | | | Correct rendering of conversions when conversion rate is a token. (#2498)Dan J Miller2017-10-273-20/+52
| | | * | | | | | | | | | | Clear import error state on logout.Dan2017-10-272-0/+5
| | | * | | | | | | | | | | eth_sign warning colorDan2017-10-272-3/+18
| | | * | | | | | | | | | | Change min gas price to 0.1 GWEIDan2017-10-277-31/+68
| | | * | | | | | | | | | | Fix input border rendering on mobileAlexander Tseung2017-10-271-0/+1
| | | | * | | | | | | | | | mascara:create-password - use less words in metamask explanationfrankiebee2017-11-071-1/+1
| | | | * | | | | | | | | | mascara - fix words and enviroment varsfrankiebee2017-11-032-11/+7
| | | | * | | | | | | | | | mascara:first-time - fix wordingfrankiebee2017-11-011-2/+2
| | | | * | | | | | | | | | fix mascara buildfrankiebee2017-11-011-1/+1
| | | | * | | | | | | | | | mascara:first-time - add alpha warning and a about metamask and mascotfrankiebee2017-11-012-47/+107
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-15 16:27:33 +0800