aboutsummaryrefslogtreecommitdiffstats
path: root/ui
Commit message (Expand)AuthorAgeFilesLines
* ui - lint fixkumavis2018-03-141-1/+1
* Merge pull request #3445 from TheCriw/i3440-seed-restore-trim-invalid-characterskumavis2018-03-141-0/+13
|\
| * FIX #3440 improved verification of restore from seed phrasecriw2018-03-061-0/+13
* | Remove windows.h from i18n.jsThomas2018-03-141-1/+0
* | Add closing parens to appNameThomas2018-03-141-1/+1
* | Merge branch 'master' into i18nThomas Huang2018-03-1411-105/+245
|\ \
| * \ Merge branch 'master' into i3033-responsive-newui-onboardingkumavis2018-03-1419-331/+469
| |\ \
| | * \ Merge pull request #3470 from danjm/newui-onboarding-fontskumavis2018-03-141-1/+1
| | |\ \
| | | * | Update first time flow button fonts, and first-time-flow default font, to Rob...Dan2018-03-081-1/+1
| | * | | Merge pull request #3495 from alextsg/cb-290kumavis2018-03-145-99/+93
| | |\ \ \
| | | * | | Increase tap areas for menu buttons on mobileAlexander Tseung2018-03-105-99/+93
| * | | | | Left align create password.Dan2018-03-131-0/+12
| * | | | | Styling fixes to welcome; hide network component on create password; shown we...Dan2018-03-133-8/+7
| * | | | | Add welcome screen to new-ui browser first time flow.Dan2018-03-096-3/+139
| * | | | | Make new-ui create password screen responsive.Dan2018-03-081-24/+0
| | |_|/ / | |/| | |
* | | | | Add missing opening parens to pag-container__subtitleThomas2018-03-141-1/+1
* | | | | Merge branch 'master' into i18nThomas Huang2018-03-145-83/+122
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Update deposit ether styling (#3510)Alexander Tseung2018-03-135-82/+125
| | |/ / | |/| |
* | | | Add loglevel and window.log to i18n.jsThomas2018-03-131-0/+2
* | | | Add i18n back into JsonImportSubviewThomas2018-03-121-7/+7
* | | | Merge branch 'master' into i18nThomas Huang2018-03-1210-150/+228
|\| | |
| * | | Remove de-selected token from selectedTokens hash instead of setting to null ...Alexander Tseung2018-03-091-6/+10
| * | | Add empty object default value for tokenData (#3493)Alexander Tseung2018-03-091-2/+2
| * | | Explicitly define state in import account from json component (#3491)Alexander Tseung2018-03-092-79/+103
| * | | Fix flashing to Log in screen after logging in or restoring from seed phrase ...Alexander Tseung2018-03-084-65/+104
| * | | Merge pull request #3409 from scsaba/seed-phrase-verificationDan Finlay2018-03-081-0/+7
| |\ \ \
| | * | | verify seedwords on log inCsaba Solya2018-03-041-0/+7
| * | | | Update network colours for better accessibility. (#3469)Dan J Miller2018-03-082-4/+8
| | |/ / | |/| |
* | | | Correct caps of Send button on main screen.Dan2018-03-081-1/+1
* | | | Merge branch 'master' into i18nDan Finlay2018-03-075-20/+30
|\| | |
| * | | Merge branch 'master' into ImportAccountMessageV2kumavis2018-03-078-12/+41
| |\ \ \
| | * \ \ Merge pull request #3455 from MetaMask/i2475-UnifyLogInWordingkumavis2018-03-071-2/+2
| | |\ \ \
| | | * \ \ Merge branch 'master' into i2475-UnifyLogInWordingDan Finlay2018-03-073-9/+8
| | | |\ \ \
| | | * | | | Replace Lock wording with Log Out / Log InDan Finlay2018-03-071-2/+2
| | | | |_|/ | | | |/| |
| * | | | | Merge branch 'master' into ImportAccountMessageV2Dan Finlay2018-03-073-14/+14
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into ImportAccountMessageV2Thomas Huang2018-03-0315-35/+463
| |\ \ \ \ \ \
| * | | | | | | Import Account disclaimerThomas2018-03-032-9/+12
| * | | | | | | Swap color scheme for import account labelThomas2018-03-031-2/+3
| * | | | | | | Remove committed out merge codeThomas2018-02-281-16/+0
| * | | | | | | Change Loose label to ImportedThomas2018-02-281-1/+1
| * | | | | | | Add import account disclaimerThomas2018-02-281-0/+22
* | | | | | | | Correct merge conflict resolution errors.Dan2018-03-072-9/+0
* | | | | | | | Merge branch 'master' into i18nDan2018-03-0759-297/+1265
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge pull request #3433 from danjm/i3087-shapeshift-split-undefinedDan Finlay2018-03-075-4/+28
| |\ \ \ \ \ \ \
| | * | | | | | | Shapeshift form handles market info unavailable errors.Dan2018-03-075-4/+28
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge pull request #3446 from danjm/NewUI-handle-token-balance-on-editDan Finlay2018-03-071-3/+7
| |\ \ \ \ \ \ \
| | * | | | | | | Gracefully handle null token balance in new ui send.Dan2018-03-061-3/+7
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge pull request #3444 from danjm/i3348-minus-not-a-numberDan Finlay2018-03-071-2/+3
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Prevent user from selecting max amount until there is an estimated gas total.Dan2018-03-061-2/+3
| | |/ / / / /
| * | / / / / Default add-token decimal value to string (#3451)Dan J Miller2018-03-071-1/+1
| | |/ / / / | |/| | | |
| * | | | | Fix seed phrase validation clearing form (#3417)Alexander Tseung2018-03-072-8/+7
| |/ / / /
| * | / / Fixes shapeshift coin selection dropdown. (#3416)Dan J Miller2018-03-062-6/+7
| | |/ / | |/| |
| * | | Fix NewUI reveal seed flow. (#3410)Dan J Miller2018-03-034-8/+22
| * | | Allow adding 0 balance tokens in old ui and editing custom token info in new ...Dan J Miller2018-03-031-5/+21
| | |/ | |/|
| * | Fix network menu for custom URLs (#3366)Alexander Tseung2018-03-022-14/+31
| * | Fix exception thrown when styleOverride is not present (#3364)Alexander Tseung2018-03-021-1/+1
| * | Merge pull request #3356 from MetaMask/cdn-minimizationKevin Serrano2018-03-021-2/+336
| |\ \
| | * | Correct ttf format name to 'truetype'Dan2018-03-021-42/+42
| | * | Check in all font files locally.Kevin Serrano2018-03-011-2/+336
| | |/
| * | Merge pull request #3359 from MetaMask/token-check-urlkumavis2018-03-011-1/+1
| |\ \
| | * | add token - check for logo url before trying to usekumavis2018-03-011-1/+1
| * | | Merge pull request #3332 from danjm/MM-onboarding-flow-style-improvementskumavis2018-03-013-0/+47
| |\ \ \
| | * | | Adds beta label to Metamask name in full screen app bar.Dan2018-02-282-0/+17
| | * | | Move beta warning to app header.Dan2018-02-281-0/+6
| | * | | Body width container in first time flow is consistent with app bar.Dan2018-02-281-0/+24
| | | |/ | | |/|
| * | | Merge pull request #3340 from danjm/i3338-contract-published-terminologykumavis2018-03-012-2/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Replace 'Contract Published' with 'Contract Deployment' for clearer indicatio...Dan2018-02-282-2/+2
| | |/
| * / Define event locally in onClickOutside method in account-dropdowns.jsDan2018-03-012-2/+2
| |/
| * fix feature flags being undefinedfrankiebee2018-02-271-0/+1
| * Use same logic for downloading state logs in the old/uatThomas Huang2018-02-211-1/+7
| * Render loading inside notice screen, and don't set isLoading from unMarkPassw...Dan2018-02-211-1/+0
| * Try fixing notice screen synchronous state callDan Finlay2018-02-211-2/+1
| * Fix Import Existing DEN in popup New UI first time flow.Dan2018-02-202-2/+24
| * 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-176-6/+6
| |\
| | * Remove accessing PropTypes from main React packageAlexander Tseung2018-02-076-6/+6
| * | [NewUI] Adds the mascara first time flow to betaUI extension (#3257)Dan J Miller2018-02-162-4/+8
| * | 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-141-6/+4
| | * | Only open a new window on restore from seed if in extension view.Dan2018-02-142-3/+6
| * | | Merge pull request #3209 from danjm/MM-634-newui-reset-accountDan Finlay2018-02-145-35/+157
| |\ \ \ | | |/ / | |/| |
| | * | Add reset account button to new UI.Dan2018-02-095-35/+157
| * | | Merge pull request #3216 from danjm/MM-666-try-beta-link-unlock-privacy-screensDan Finlay2018-02-141-0/+17
| |\ \ \
| | * | | Try beta link on unlock and privacy screens.Dan2018-02-091-0/+17
| | |/ /
| * | | 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-082-0/+22
| |\ \
| | * \ Merge branch 'uat' into uat-nextDan2018-02-082-0/+22
| | |\ \
| | | * \ Merge branch 'master' into uatDan2018-02-082-0/+22
| | | |\ \
| | | | * | Scrollable Settings screen for FirefoxThomas2018-02-021-1/+6
| | | | * | Merge pull request #3161 from MetaMask/AddResetExplanationFrankie2018-02-012-59/+20
| | | | |\ \
| | | | | * | Add explanation of account resettingDan Finlay2018-02-011-0/+20
| | | | | * | Remove unused fileDan Finlay2018-02-011-59/+0
| | | | * | | Merge pull request #3146 from MetaMask/i3082-AddTokenValidateInputsFrankie2018-02-011-2/+2
| | | | |\ \ \ | | | | | |/ / | | | | |/| |
| | | | | * | Set address to default with empty string, add test validation.Thomas2018-01-311-2/+2
| | | | * | | added reset account featureBruno Barbieri2018-01-312-0/+35
| | | | * | | Add warning when importing no valid fileDan Finlay2018-01-311-0/+6
| | | | |/ /
| * | | / / 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-085-24/+39
| * | | | Update modal header design on send screen (#3196)Alexander Tseung2018-02-073-55/+126
| * | | | 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
| * | | Add functional integration testing to Add Token flow (#3189)Alexander Tseung2018-02-061-3/+4
| * | | Wallet view supports screen sizes between 576px and 667px (#3193)Dan J Miller2018-02-065-24/+70
| * | | [NewUI] Use tooltip for copy to clipboard helper text on main screen. (#3120)Dan J Miller2018-02-015-11/+76
| * | | [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
| |/ /
| * | Merge branch 'master' into uatThomas Huang2018-01-241-1/+0
| |\|
| | * add a `x` close button to gas calc loding screen on conf-txfrankiebee2018-01-182-2/+16
| * | String interpolate version in settingsThomas2018-01-231-1/+1
* | | Implemented feedback to make i18n work on macDan Finlay2018-03-073-8/+11
* | | complete i18n across new UINick Doiron2018-01-3032-96/+115
* | | pass linter, update ui testNick Doiron2018-01-281-8/+10
* | | get t imported in all files currently using i18nNick Doiron2018-01-2530-1/+30
* | | separate out cross-browser i18n for extensionsNick Doiron2018-01-2524-7/+41
* | | better organization of locale file; i18n in more view filesNick Doiron2018-01-2425-135/+123
* | | first steps to i18nNick Doiron2018-01-2331-153/+148
|/ /
* | Merge pull request #3049 from chikeichan/newmasterChi Kei Chan2018-01-201-1/+1
|\ \
| * \ Merge branch 'uat' into newmasterChi Kei Chan2018-01-20152-3280/+17901
| |\ \ | | |/ | |/|
| * | Add network-indicator classname to network loading spinnerThomas2018-01-181-1/+1
* | | Get version from manifest instead of hard coding in New UI info page.Dan2018-01-201-1/+3
| |/ |/|
* | Fix transaction list font sizes, paddingAlexander Tseung2018-01-192-17/+7
* | Merge pull request #3024 from alextsg/cb-529Kevin Serrano2018-01-193-3/+5
|\ \
| * | Fix lint errorsAlexander Tseung2018-01-181-1/+1
| * | Update popout to fullscreen iconAlexander Tseung2018-01-182-2/+4
* | | [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-181-1/+3
|\ \
| * | Fix rendering QR code in old UI, hide unnecessary back buttonAlexander Tseung2018-01-171-1/+3
* | | Merge pull request #3007 from alextsg/uat-master-011618Chi Kei Chan2018-01-183-5/+7
|\ \ \
| * | | Merge branch 'uat' into uat-master-011618Alexander Tseung2018-01-17152-3280/+17868
| |\| | | | |/ | |/|
| * | Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeightDan Finlay2018-01-172-1/+7
| |\ \
| | * \ Merge pull request #2984 from MetaMask/RenameLockToLogoutThomas Huang2018-01-171-1/+1
| | |\ \
| | | * | Rename lock to log outDan Finlay2018-01-161-1/+1
| | * | | Merge branch 'master' into open-popupFrankie2018-01-161-3/+3
| | |\| |
| | * | | add a loading spinner to conf-tx viewfrankiebee2018-01-151-0/+6
| * | | | Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeightDan Finlay2018-01-161-3/+3
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Use httpsDan Finlay2018-01-131-1/+1
| | * | | Update support links for helpscoutDan Finlay2018-01-101-3/+3
| | |/ /
| * | | Add max height for Firefox addon overflow and hide horizontal scrolltmashuang2018-01-111-0/+2
| * | | Add one px to address for Firefox clippingtmashuang2018-01-111-0/+1
| |/ /
| * | Merge pull request #2855 from abitrolly/patch-2kumavis2018-01-091-1/+0
| |\ \
| | * | info.js Remove width element to fix email layoutAnatoli Babenia2018-01-041-1/+0
| * | | Merge pull request #2851 from MetaMask/i2812-seedworderrorfixKevin Serrano2018-01-091-0/+4
| |\ \ \ | | |/ / | |/| |
| | * | Add fix for infinite spinner for incorrect seed phrase.Kevin Serrano2018-01-041-0/+4
* | | | 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
| |_|/ |/| |
* | | 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-161-23/+30
* | | | 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 branch 'uat' into cb-388Chi Kei Chan2018-01-1315-309/+732
|\ \ \ \
| * | | | Fix styling in initializationAlexander Tseung2018-01-132-5/+14
| |/ / /
| * | | [NewUI-flat] New deposit ether modal UI. (#2642)Dan J Miller2018-01-1311-301/+711
| * | | 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-1111-68/+64
|/ / /
* | | ui - fix font path namekumavis2018-01-091-2/+2
* | | Merge pull request #2848 from MetaMask/NewUI-flatAlexander Tseung2018-01-042-5/+9
|\ \ \
| * \ \ Merge branch 'NewUI-flat' into NewUI-flat-4.0.5cAlexander Tseung2018-01-04146-2909/+16765
| |\ \ \ | | |/ / | |/| |
| * | | fix commentoosthuizenr2018-01-031-1/+1
| * | | Fixes #2834Renier Oosthuizen2018-01-031-5/+6
| | |/ | |/|
| * | Add frontend validation to ensure that ether inputs are valid.Kevin Serrano2017-12-281-2/+12
| * | Add frontend validation to check if send ether input is a valid number.Kevin Serrano2017-12-281-0/+6
| * | Add backend fix for util in normalizeethstringtowei.Kevin Serrano2017-12-281-0/+3
* | | Merge pull request #2799 from MetaMask/NewUI-flatAlexander Tseung2017-12-2334-191/+1115
|\ \ \ | | |/ | |/|
| * | Track usage of old and new UI (#2794)Alexander Tseung2017-12-235-10/+63
| * | [NewUI] Fixes tests and sends user to NewUI after registering. (#2788)Dan J Miller2017-12-223-5/+7
| * | Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20Chi Kei Chan2017-12-216-74/+93
| |\ \
| | * | 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-216-95/+80
| | * | Canceled, edited transactions show edited amount.Dan2017-12-213-2/+35
| * | | Merge branch 'master' into NewUI-flatDan2017-12-213-37/+109
| |\ \ \ | | |/ / | |/| / | | |/
| | * Merge pull request #2706 from danjm/MM-fix-buy-cancel-buttonThomas Huang2017-12-151-1/+1
| | |\
| | | * Fixes the cancel button in the buy screen to take the user home.Dan2017-12-091-1/+1
| | * | Show watched tokens with no balanceDan Finlay2017-12-131-4/+1
| | |/
| | * Merge pull request #2654 from abitrolly/patch-2Kevin Serrano2017-12-071-1/+1
| | |\
| | | * Download State Logs with .json extensionAnatoli Babenia2017-12-051-1/+1
| | * | Add 10% price bump to retry attempts.Dan Finlay2017-12-071-1/+3
| | * | Show retry button on submitted transactions greater than 30 seconds, add hove...Alexander Tseung2017-12-072-1/+11
| | * | Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into R...Dan Finlay2017-12-071-4/+4
| | |\ \
| | | * | Fix styling of Retry butonAlexander Tseung2017-12-071-4/+4
| | * | | Enforce retry tx at minimum gas of previous txDan Finlay2017-12-071-1/+9
| | |/ /
| | * | Fix retry actionDan Finlay2017-12-071-2/+2
| | * | View tx after editing state to unconfirmedDan Finlay2017-12-071-1/+9
| | * | Fix actionDan Finlay2017-12-071-2/+2
| | * | Connect to redux for retryTransactionAlexander Tseung2017-12-071-2/+10
| | * | Add button to retry transactionAlexander Tseung2017-12-071-34/+69
| | * | Add retry background method and actionDan Finlay2017-12-072-1/+15
| | |/
| | * Prevent multiple submissions of first time formDan Finlay2017-11-211-1/+6
| * | [NewUI] Hide UI toggle in mascara (#2772)Dan J Miller2017-12-213-18/+22
| * | 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
| * | Fix height of login screenDan2017-12-131-27/+25
| * | Fix isMascara and update yarn.lockChi Kei Chan2017-12-131-2/+2
| * | 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-132-0/+9
| * | Merge branch 'NewUI-flat' into cb-372Chi Kei Chan2017-12-0817-54/+360
| |\ \
| | * \ Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UIChi Kei Chan2017-12-087-16/+61
| | |\ \
| | | * | Update max amount behaviour to meet new specs.Dan2017-12-076-15/+55
| | | * | Merge branch 'master' into NewUI-flat-merge-with-masterDan2017-12-071-1/+6
| | * | | 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-056-2/+135
| | * | | Update newUI UI for switching back to old UI.Dan2017-12-052-8/+24
| | * | | Lint fixDan2017-12-051-2/+2
| | * | | New-ui actions accomodates old-ui.Dan2017-12-052-8/+11
| | * | | Add UI selectionDan2017-12-057-29/+94
| | |/ /
| * / / Update font weights to 300, remove animation from network dropdown, fix netwo...Alexander Tseung2017-12-025-23/+28
| |/ /
| * | Remove useBlockie in props for renderThomas Huang2017-11-291-1/+1
| * | Fixes changes requested in pullrequestreview-79088534Jason Clark2017-11-271-2/+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-263-85/+413
| * | tweaking stylingJason Clark2017-11-252-9/+27
| * | incremental commit of working blockie componentJason Clark2017-11-252-15/+56
| * | toggle wired up to preferences property storeJason Clark2017-11-253-20/+30
| * | incremental commitClark, Jason (Contractor)2017-11-244-1/+42
| * | 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-1633-173/+756
|\| |
| * | Merge branch 'master' into merge-masterChi Kei Chan2017-11-163-10/+29
| |\|
| | * Use const and fix lint warningsDaijiro Wachi2017-10-311-2/+2
| | * Remove warning message when show import pageDaijiro Wachi2017-10-312-0/+2
| | * Add option to copy directly to clipboard.Kevin Serrano2017-10-271-3/+11
| | * Resolve merge conflictsKevin Serrano2017-10-2725-111/+230
| | |\
| | * \ Merge branch 'master' into version-debuggingKevin Serrano2017-10-109-12/+217
| | |\ \
| | * | | Make the function callback friendly.Kevin Serrano2017-10-102-4/+11
| | * | | Merge branch 'master' into version-debuggingKevin Serrano2017-10-062-5/+5
| | |\ \ \
| | * | | | lintKevin Serrano2017-10-051-1/+1
| | * | | | Further adjustment to maintain APIKevin Serrano2017-10-051-2/+2
generated by cgit (git 2.34.1) at 2024-11-22 19:01:58 +0800