aboutsummaryrefslogtreecommitdiffstats
path: root/ui
Commit message (Expand)AuthorAgeFilesLines
* eslint --fix .brunobar792018-07-0320-22/+22
* Merge pull request #4687 from snreynolds/i4623-getConvertedCurrencyDan J Miller2018-06-308-24/+9
|\
| * fixes #4623Sara Reynolds2018-06-308-24/+9
* | Merge pull request #4640 from weijiekoh/developDan J Miller2018-06-301-0/+3
|\ \
| * | removed stray console.logKoh Wei Jie2018-06-221-1/+0
| * | fixed blank boolean field for typed signing for new UIKoh Wei Jie2018-06-221-0/+4
* | | Merge pull request #4647 from MetaMask/fix-overflow-currency-displayDan J Miller2018-06-303-2/+12
|\ \ \
| * | | Improve attribute syntax in send-amount-row.component.jsDan J Miller2018-06-301-1/+1
| * | | Remove input arrows for send screen amount row on firefox.Dan2018-06-293-0/+11
| * | | Fix issues with scrollbar in currency display.Dan2018-06-292-2/+1
| | |/ | |/|
* | | Merge pull request #4690 from MetaMask/i4662-token-gas-estimate-uxDan Finlay2018-06-293-0/+11
|\ \ \
| * | | Set based estimate for token sends to be updated once recipient address speci...Dan2018-06-293-0/+11
| |/ /
* | | Merge pull request #4634 from MetaMask/i4503-touch-up-shpshft-button-styleThomas Huang2018-06-292-7/+26
|\ \ \ | |/ / |/| |
| * | Fix style of shapeshift screen in deposit modal.Dan2018-06-222-7/+26
| |/
* | Merge pull request #4678 from MetaMask/e2e-beta-tests-upgradeDan J Miller2018-06-291-4/+8
|\ \
| * | Fix send token tests in beta ui e2e tests.Dan2018-06-271-4/+8
| * | Only show the customize gas modal if the estimateGas call is not currently in...Dan2018-06-274-6/+79
* | | Merge pull request #4674 from MetaMask/removeOnlyTestsThomas Huang2018-06-291-1/+1
|\ \ \
| * | | Remove .only on testtmashuang2018-06-271-1/+1
| |/ /
* | | Merge pull request #4677 from MetaMask/customize-gas-loading-waitDan J Miller2018-06-284-6/+79
|\ \ \
| * | | Only show the customize gas modal if the estimateGas call is not currently in...Dan2018-06-194-6/+79
* | | | Merge pull request #4574 from MetaMask/i4409-i4410-ens-input-enhancementsDan J Miller2018-06-286-41/+71
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove commented out code in ens-input.Dan2018-06-221-1/+0
| * | | Merge branch 'develop' into i4409-i4410-ens-input-enhancementsDan2018-06-2019-56/+205
| |\| |
| * | | ENS input in send form shows distinct errors for invalid addresses and non-ex...Dan2018-06-156-22/+43
| * | | ENS name revalidates on network change.Dan2018-06-131-23/+33
* | | | Merge pull request #4627 from TrejGun/gas-fee-displayDan J Miller2018-06-278-57/+121
|\ \ \ \ | |_|_|/ |/| | |
| * | | fix default importtrejgun2018-06-232-2/+2
| * | | linttrejgun2018-06-212-3/+13
| * | | refactor gas-fee-display componenttrejgun2018-06-218-57/+111
* | | | Scroll large amounts in the send componentWhymarrh Whitby2018-06-212-4/+6
* | | | Handle large token balances in tx list heroWhymarrh Whitby2018-06-214-5/+21
| |_|/ |/| |
* | | Merge pull request #4584 from MetaMask/fix-send-tokenkumavis2018-06-1911-19/+140
|\ \ \
| * | | On send screen amount change, updateGas call now includes current to address.Dan2018-06-196-4/+37
| * | | Send screen returns simple gas cost if no to address specified when not sendi...Dan2018-06-192-3/+8
| * | | Remove leading zeroes from send screen amount row input.Dan2018-06-191-1/+5
| * | | Fix currency-display.js rendering of token amounts.Dan2018-06-191-0/+1
| * | | Revert to updating amount on blur of input change; update gas on blur of amou...Dan2018-06-192-5/+11
| * | | Fix unit testsAlexander Tseung2018-06-161-3/+8
| * | | Estimate gas limit when the token amount changes. Fix amount inputAlexander Tseung2018-06-164-16/+18
| * | | Update send.utils.js estimateGas tests.Dan2018-06-152-5/+20
| * | | Add a buffer to new ui gas estimatesDan2018-06-152-2/+52
| * | | Add hex-prefix to gas estimate resultAlexander Tseung2018-06-152-4/+4
| |/ /
* / / View address of an added token (#4591)Csaba S2018-06-192-22/+37
|/ /
* | Merge pull request #4566 from MetaMask/notice-phishingDan Finlay2018-06-154-14/+14
|\ \
| * | notices - replace getLatestNotice with getNextNoticekumavis2018-06-144-14/+14
| |/
* / add help link to eth_sign warningBobby Dresser2018-06-122-1/+14
|/
* Access correct property from state in confirm screen components gatherTxMeta()Dan2018-06-082-2/+2
* Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-0713-63/+90
|\
| * Merge pull request #4418 from MetaMask/handle-import-account-failure-in-uikumavis2018-06-074-19/+47
| |\
| | * Merge branch 'develop' into handle-import-account-failure-in-uiDan2018-06-0513-28/+143
| | |\
| | * \ Merge branch 'develop' into handle-import-account-failure-in-uiDan2018-06-0334-227/+366
| | |\ \
| | * | | Fix then-catch + error handling in import-accountDan2018-05-312-4/+2
| | * | | Importing account by json and private key shows error and does not change acc...Dan2018-05-314-16/+46
| * | | | i18n - ja improvements03-262018-06-076-16/+34
| * | | | Render the accounts in keyring orderWhymarrh Whitby2018-06-061-3/+4
| * | | | Remove unused identities reducer from UIWhymarrh Whitby2018-06-062-22/+0
| * | | | Remove selectedIdentity prop from wallet viewWhymarrh Whitby2018-06-061-5/+3
| * | | | Ensure selectedAddress exists when render walletWhymarrh Whitby2018-06-061-0/+4
| | |_|/ | |/| |
* | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-0515-30/+145
|\| | |
| * | | Update hide-token-confirmation-modal.js to use new modalState schema (#4482)Dan J Miller2018-06-053-3/+3
| * | | Merge pull request #4428 from MetaMask/fix-tokenlist-balance-overflowDan J Miller2018-06-052-4/+13
| |\ \ \
| | * | | Fix ellipsesAlexander Tseung2018-06-011-5/+6
| | * | | Token name is not hidden in wallet if balance is exceptionally long.Dan2018-06-012-3/+11
| | |/ /
| * | / Indicate the current selected account on the popup account view (#4445)Alexander Tseung2018-06-058-21/+127
| | |/ | |/|
| * | update helpscout links to zenhubBobby Dresser2018-06-012-2/+2
* | | Simplify recipient code check in send.utils estimateGasDan2018-06-051-4/+5
* | | Default currency-display valueToRender to empty string when not readOnly ('0'...Dan2018-06-021-2/+2
* | | Fix calculation of data property for gas estimation on token transfers.Dan2018-06-027-47/+41
* | | Merge branch 'i3725-refactor-send-component-' into i3914-fix-newui-send-gas-e...Dan2018-06-0152-421/+758
|\ \ \
| * | | Remove .onlyDan2018-06-011-1/+1
| * | | Merge branch 'i3725-refactor-send-component-' of github.com:MetaMask/metamask...Dan2018-06-016-153/+92
| |\ \ \
| | * \ \ Merge pull request #4386 from MetaMask/i4077-replace-currency-input-with-nume...Dan J Miller2018-06-016-153/+92
| | |\ \ \
| | | * | | Improve input width calculation in currency-display.jsDan2018-06-011-3/+2
| | | * | | Fix currency display send integration tests.Dan2018-05-311-1/+1
| | | * | | Delete currency-input.jsDan2018-05-302-114/+0
| | | * | | Remove currency input from input-numberDan2018-05-301-4/+4
| | | * | | Stop using external NumericInput component.Dan2018-05-301-8/+15
| | | * | | Replaces currency-input.js with NumericInputDan2018-05-294-38/+85
| * | | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-0145-268/+665
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| |
| | * | | Add new alert modalsAlexander Tseung2018-06-0116-165/+287
| | * | | Change btn-secondary styles to btn-default. Make btn-secondary red warning st...Alexander Tseung2018-06-0116-62/+79
| | | |/ | | |/|
| | * | Prevent loading screen from overlaying the app bar (#4417)Alexander Tseung2018-05-314-12/+4
| | * | Fix error handling on incorrect password (#4401)Alexander Tseung2018-05-311-11/+9
| | * | Add notification for dropped retry transactions (#4363)Alexander Tseung2018-05-3014-68/+294
| | * | Fix add-token token list placeholder width (#4365)Alexander Tseung2018-05-301-0/+4
| | * | Fix text field labels of first time flow. Add text fields to storybook (#4389)Alexander Tseung2018-05-292-44/+80
| | * | newui - unlock - dont catch errors unrelated to tryUnlockMetamaskkumavis2018-05-291-2/+2
| | * | Fix scrolling in Deposit Ether modal (#4336)Alexander Tseung2018-05-241-2/+4
* | | | Improve efficiency of estimateGasPriceFromRecentBlocksDan2018-05-311-10/+5
* | | | test - send-utils.test - lint fixkumavis2018-05-311-1/+1
* | | | Gas estimation uses block gas limit as fallback if query.estimateGas returns ...Dan2018-05-312-5/+39
* | | | Auto update gas estimate when to changes.Dan2018-05-3114-64/+109
* | | | Support smaller decimals in currency-displayDan2018-05-311-1/+1
* | | | Estimate gas using same algorithm as backend.Dan2018-05-3112-98/+153
* | | | Simplify gas estimate actions and add local estimateGasPriceFromRecentBlocks ...Dan2018-05-3113-55/+203
* | | | getParamsForGasEstimate extracts symbol from token instead of just accepting ...Dan2018-05-313-6/+6
* | | | Rename gas change actions.Dan2018-05-314-22/+22
* | | | Split out getGasEstimate logic from updateGasTotalDan2018-05-311-3/+12
|/ / /
* | | Update amount error on update of send screen.Dan2018-05-313-23/+30
* | | Fix setting of token balance on account switch in send screen from field.Dan2018-05-313-3/+3
| |/ |/|
* | Send refactor: fix error handling and form disabling in send form.Dan2018-05-268-47/+37
* | Clean up for send refactor PR.Dan2018-05-255-15/+7
* | Move formShouldBeDisabled from send-footer util to component.Dan2018-05-254-40/+72
* | Fix order of button text in page-container-footer.Dan2018-05-252-10/+4
* | Display correct titles and subtitles on send token and editing send transacti...Dan2018-05-258-14/+105
* | Fix display of primary currency symbol in send amount rowDan2018-05-252-2/+8
* | Send refactor: fix amount max button for tokens.Dan2018-05-242-2/+13
* | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-2463-1052/+1358
|\|
| * Merge pull request #4308 from MetaMask/i4232-addtokenkumavis2018-05-2345-971/+1280
| |\
| | * Update input field border on focusAlexander Tseung2018-05-221-1/+3
| | * Fix testsAlexander Tseung2018-05-211-11/+6
| | * Update designs for Add Token screenAlexander Tseung2018-05-2045-971/+1283
| * | Merge pull request #4295 from MetaMask/kumavis-patch-3Frankie2018-05-221-1/+2
| |\ \
| | * | token-util - warn via loglevel on token lookup failurekumavis2018-05-191-1/+2
| | |/
| * | Merge pull request #4316 from MetaMask/fix-signature-requestkumavis2018-05-221-2/+0
| |\ \
| | * | Fix signature request header textAlexander Tseung2018-05-211-2/+0
| | |/
| * | Merge pull request #4273 from brunobar79/fix-new-ui-popup-headerkumavis2018-05-221-2/+0
| |\ \
| | * | remove fix header heightBruno2018-05-171-2/+0
| | |/
| * / Move setAccountLabel into PreferencesControllerWhymarrh Whitby2018-05-178-18/+18
| |/
| * Merge pull request #4255 from MetaMask/i4233-dropdownskumavis2018-05-175-21/+58
| |\
| | * Fix account and network dropdowns in confirm screenAlexander Tseung2018-05-155-21/+58
| * | ui - unlock - remove setNetworkEndpoints calls from new unlock screenkumavis2018-05-172-3/+0
| * | ui - remove files accidently added by bad mergekumavis2018-05-172-328/+0
| * | Merge branch 'develop' of github.com:MetaMask/metamask-extension into network...kumavis2018-05-1745-317/+850
| |\ \
| | * | Add error message when passwords don't match in first time flow. Change input...Alexander Tseung2018-05-142-48/+54
| | |/
| | * Add TextField component to storybookAlexander Tseung2018-05-123-2/+25
| | * Add new unlock screen designAlexander Tseung2018-05-1222-569/+559
| | * Merge pull request #4196 from MetaMask/i3457-fontweightThomas Huang2018-05-0911-22/+2
| | |\
| | | * Change font weight from 300 to 400Alexander Tseung2018-05-0611-22/+2
| | * | Add storybook integrationAlexander Tseung2018-05-045-2/+96
| | |/
| | * Merge pull request #4156 from MetaMask/i4010-spinnerkumavis2018-05-039-10/+115
| | |\
| | | * Fix styling of the app spinnerAlexander Tseung2018-05-019-10/+115
| | * | Merge pull request #4162 from MetaMask/ui-actions-pify-importNewAccountkumavis2018-05-021-1/+1
| | |\ \
| | | * | ui - actions - importNewAccount - rethrow err on failurekumavis2018-05-021-1/+1
| * | | | lint - cleanup some unused variableskumavis2018-05-036-13/+0
| * | | | network - remove setNetworkEndpointskumavis2018-05-017-29/+1
| |/ / /
| * / / Handle Promise rejections when importing accounts (#4142)Paul Bouchon2018-05-012-0/+4
| |/ /
| * | ui - actions - importNewAccount - use async and pify for cleaner syntaxkumavis2018-05-011-24/+20
| * | Merge pull request #4059 from MetaMask/i-4033-seed-wordskumavis2018-05-0113-329/+354
| |\ \
| | * | Redirect to correct seed phrase screenAlexander Tseung2018-04-271-2/+2
| | * | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-231-1/+9
| | |\ \
| | * | | Use new design for reveal seed screen. Persist seed words only in first time ...Alexander Tseung2018-04-2312-285/+346
| | * | | Revert "Fix UI getting stuck in Reveal Seed screen"Alexander Tseung2018-04-222-27/+3
| * | | | Fix ShapeShift purchases on new UIbitpshr2018-04-291-6/+7
| * | | | Merge pull request #4113 from MetaMask/i4107-send-tokens-without-symbols-deci...kumavis2018-04-284-45/+43
| |\ \ \ \
| | * | | | Simplify return of existing token in getSymbolAndDecimalsDan2018-04-281-4/+1
| | * | | | Convert decimals to string in getSymbolAndDecimals; return null for symbol or...Dan2018-04-283-20/+10
| | * | | | Wraps calls to symbol() and decimals() in try catchDan2018-04-283-30/+41
| | | |_|/ | | |/| |
| * / | | Allow transactions with 0-gwei gas price (#4073)Paul Bouchon2018-04-273-12/+11
| |/ / /
| * | | i18n-helper - wrap fallback in brackets to help indicate something is wrongkumavis2018-04-261-1/+1
| * | | Return key instead of empty string on i18n failDan Finlay2018-04-261-1/+1
| * | | i18n-helper - abort on i18n failurekumavis2018-04-251-1/+2
* | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-152-48/+54
* | | | Import defaults in send_/Dan2018-05-1510-17/+18
* | | | Fix Button component path in page-container footer.Dan2018-05-151-1/+1
* | | | Add index.js files to send_ subdirectoriesDan2018-05-1513-0/+13
* | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-1463-1019/+1233
* | | | Tests for send.duck.jsDan2018-05-144-20/+167
* | | | Rename ducks/send.js to ducks/send.duck.jsDan2018-05-1415-14/+14
* | | | Add missing unit tests in send_/: now 100% function test coverage in send_/Dan2018-05-144-112/+298
* | | | Lint fixesDan2018-05-1410-31/+6
* | | | Unit tests for account-list-item, amount-max-button and send-amount-row compo...Dan2018-05-143-0/+381
* | | | Unit tests for from-dropdown; split out send-dropdown-list from from-dropdownDan2018-05-124-39/+260
* | | | SendRowErrorMessage component test.Dan2018-05-111-0/+28
* | | | Unit tests for send from, gas, to and wrapper row components.Dan2018-05-114-0/+403
* | | | Fix test descriptions and remove unnecessary proptypes.Dan2018-05-105-14/+10
* | | | Adds test for send, send-content, send-footer and send-header components.Dan2018-05-076-16/+516
* | | | Unit tests for containers, utils and selectors in send_/Dan2018-05-0544-73/+2506
* | | | Merge branch 'i3725-refactor-send-component-' of github.com:MetaMask/metamask...Dan2018-05-0112-16/+137
|\ \ \ \
| * \ \ \ Merge branch 'i3725-refactor-send-component-' into i3725-refactor-send-compon...Dan2018-05-01118-1513/+4604
| |\ \ \ \
| * | | | | Refactor page-container component structureAlexander Tseung2018-04-1113-75/+173
* | | | | | Delete dead send code.Dan2018-05-0110-723/+2
| |/ / / / |/| | | |
* | | | | Remove 'goHome' from send_Dan2018-05-012-4/+1
* | | | | Move getMaxModeOn selector to amount-max-button container.Dan2018-05-013-6/+10
* | | | | Use constants for send screen errors messages.Dan2018-05-014-9/+29
* | | | | Fix send-v2__form class in send-content.componentDan2018-05-011-1/+1
* | | | | Fix amount max button.Dan2018-05-015-7/+7
* | | | | Fix close button on send screenDan2018-04-302-4/+5
* | | | | Further refactors; includes refactor of send-v2.js and associated containerDan2018-04-3024-155/+487
* | | | | Fixes to get tests passing.Dan2018-04-275-11/+11
* | | | | Lint fixes and alphabetization for i3725-refactor-send-componentDan2018-04-2735-365/+330
* | | | | Core of the refactor completeDan2018-04-2734-489/+757
* | | | | Merge branch 'master' into i3725-refactor-send-componentDan2018-04-2549-200/+300
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #3940 from nyatla/masterDan Finlay2018-04-243-1/+3
| |\ \ \ \
| | * | | | Reduced button padding.nyatla2018-04-101-0/+1
| | * | | | Expanded dropdown menu width of title.nyatla2018-04-101-1/+1
| | * | | | Changed mouse cursor to "pointer" on the cancel text at the top left of the p...nyatla2018-04-101-0/+1
| * | | | | Merge pull request #3968 from MetaMask/gh-3653Dan Finlay2018-04-2410-13/+17
| |\ \ \ \ \
| | * | | | | Clean up network configAlexander Tseung2018-04-2410-13/+17
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #4028 from MetaMask/i4016-customrpcDan Finlay2018-04-241-6/+8
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix custom RPC not redirecting to Settings pageAlexander Tseung2018-04-191-6/+8
| | | |_|/ | | |/| |
| * | | | Merge pull request #4030 from MetaMask/i4014-metamask-versionThomas Huang2018-04-201-1/+9
| |\ \ \ \
| | * | | | Show correct MetaMask version number in the Info pageAlexander Tseung2018-04-191-1/+9
| | |/ / /
| * / / / Fix exception thrown when revealing seed wordsAlexander Tseung2018-04-191-6/+18
| |/ / /
| * | | Merge pull request #3977 from MetaMask/i-3913-big-numberDan Finlay2018-04-194-25/+49
| |\ \ \
| | * | | Fix spinner layoutAlexander Tseung2018-04-184-24/+26
| | * | | Fix BigNumber exception in confirm-send-etherAlexander Tseung2018-04-181-3/+25
| * | | | Merge pull request #4004 from MetaMask/i3955-reveal-seedDan Finlay2018-04-192-3/+27
| |\ \ \ \
| | * | | | Fix UI getting stuck in Reveal Seed screenAlexander Tseung2018-04-192-3/+27
| * | | | | Merge pull request #3998 from MetaMask/i3988-checksummed-addressDan Finlay2018-04-1910-26/+44
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Show checksummed addresses throughout the UIbitpshr2018-04-1810-26/+44
| | |/ / /
| * | | | Merge branch 'master' into i3580-InternationalizeCurrencyDan Finlay2018-04-1824-107/+52
| |\| | |
| | * | | Fix confirmation popup not always openingAlexander Tseung2018-04-175-13/+18
| | * | | Merge branch 'master' into i3981-contract-ratesDan Finlay2018-04-1714-3/+14
| | |\ \ \
| | | * \ \ Merge pull request #3970 from MetaMask/i3651-removeGlobalLogDan Finlay2018-04-1713-2/+13
| | | |\ \ \
| | | | * | | Require loglevel singleton in each module that uses itbitpshr2018-04-1413-2/+13
| | | * | | | Fix action for setting localeDan Finlay2018-04-141-1/+1
| | | |/ / /
| | * | | | Maintain token prices using a background servicebitpshr2018-04-164-81/+6
| | * | | | Fetch token prices based on contract addressbitpshr2018-04-168-81/+85
| | |/ / /
| * | | | Lint fix.Dan2018-04-102-2/+2
| * | | | Merge branch 'master' into i3580-InternationalizeCurrencyDan2018-04-1049-1081/+2630
| |\| | |
| * | | | Internationalize converted value in confirm screensDan2018-04-102-4/+36
| * | | | Internationalize converted value in currency-input.jsDan2018-04-101-10/+25
| * | | | Improve display of crypto currencies when selected as the 'Current Conversion'Dan2018-04-101-4/+13
| * | | | LintedDan Finlay2018-04-041-1/+1
| * | | | Internationalize currencyDan Finlay2018-04-041-1/+6
* | | | | second commitDan2018-04-1118-50/+461
* | | | | Merge branch 'master' into i3725-refactor-send-componentDan2018-04-1045-1044/+2589
|\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | |
| * | | Fix integration testsAlexander Tseung2018-04-073-4/+6
| * | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-062-2/+8
| |\ \ \ | | | |/ | | |/|
| * | | Fix editing transactionAlexander Tseung2018-04-061-2/+1
| * | | Revert "commit"Alexander Tseung2018-04-061-1/+2
| * | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-063-3/+2
| |\ \ \
| * | | | commitAlexander Tseung2018-04-061-2/+1
| * | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-052-3/+4
| |\ \ \ \
| * | | | | Use new design for showing seed wordsAlexander Tseung2018-04-041-1/+13
| * | | | | commitAlexander Tseung2018-04-041-8/+2
| * | | | | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-044-28/+45
| |\ \ \ \ \
| * | | | | | Fix transaction confirmationsAlexander Tseung2018-04-042-17/+32
| * | | | | | Fix merge conflicts. Modify send workflowAlexander Tseung2018-04-0315-67/+331
| |\ \ \ \ \ \
| * | | | | | | Fix lint errorsAlexander Tseung2018-04-037-229/+2
| * | | | | | | Add withRouter to I18nProvider componentAlexander Tseung2018-04-031-1/+6
| * | | | | | | Refactor onboarding flowAlexander Tseung2018-04-029-47/+60
| * | | | | | | Fix conf-tx renderAlexander Tseung2018-03-312-2/+8
| * | | | | | | Fix merge conflictsAlexander Tseung2018-03-3175-471/+829
| |\ \ \ \ \ \ \
| * | | | | | | | Fix merge conflicts. Refactor renderPrimary into Home componentAlexander Tseung2018-03-319-606/+693
| * | | | | | | | Fix i18n merge conflictsAlexander Tseung2018-03-3082-567/+815
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix merge conflicts. Refactor onboarding flow.Alexander Tseung2018-03-2913-33/+65
| * | | | | | | | | Fix merge conflictsAlexander Tseung2018-03-27129-4073/+3914
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix react-router related exceptionsAlexander Tseung2018-02-102-2/+2
| * | | | | | | | | | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int...Alexander Tseung2018-02-091-3/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int...Alexander Tseung2018-02-092-36/+28
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int...Alexander Tseung2018-02-0917-102/+432
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix lint errorsAlexander Tseung2018-02-024-10/+3
| * | | | | | | | | | | | | Checks if there is currently a send in progress before redirecting to default...Dan2018-02-011-3/+7
| * | | | | | | | | | | | | Fix merge conflicts from uat-nextAlexander Tseung2018-02-0116-153/+214
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add create new account routes, fix conflicts from uat updatesAlexander Tseung2018-02-0118-225/+156
| * | | | | | | | | | | | | | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254Alexander Tseung2018-01-3061-956/+2059
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add route for signature requestAlexander Tseung2017-12-156-305/+454
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 13:24:39 +0800