aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| * \ Merge pull request #3023 from MetaMask/build-lock-gulpDan Finlay2018-01-191-1/+1
| |\ \
| | * \ Merge branch 'master' into build-lock-gulpThomas Huang2018-01-197-42/+40
| | |\ \
| | * | | test - stub provider needs to handle errorskumavis2018-01-181-2/+2
| | * | | build - lock pre-release gulp dep to commitkumavis2018-01-181-1/+1
| * | | | Merge pull request #3016 from MetaMask/sentryDan Finlay2018-01-195-1/+38
| |\ \ \ \
| | * | | | lint - ignore vendor jskumavis2018-01-181-1/+1
| | * | | | sentry - dedupe raven vendorkumavis2018-01-182-5/+2
| | * | | | lint - ignore vendor jskumavis2018-01-181-1/+1
| | * | | | sentry - breakout raven setup and add release configkumavis2018-01-183-9/+35
| | * | | | sentry - update raven and add to uikumavis2018-01-184-7/+13
| | * | | | sentry - add raven + sentry reporting configkumavis2018-01-182-0/+8
| * | | | | Merge pull request #3035 from MetaMask/infura-rest-fixDan Finlay2018-01-191-1/+1
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | deps - bump infura provider for uri length limit fixkumavis2018-01-191-1/+1
| |/ / / /
| * | | | Merge pull request #3029 from MetaMask/test-provider-stubThomas Huang2018-01-196-43/+33
| |\ \ \ \
| | * | | | deps - re-add eth-block-trackerkumavis2018-01-181-0/+1
| | * | | | test - createTestProviderTools includes block tracker layerkumavis2018-01-185-22/+25
| | * | | | test - tx controller - fix txGasUtil referencekumavis2018-01-182-3/+4
| | * | | | deps - bump json-rpc-engine for better errorskumavis2018-01-181-1/+1
| | * | | | test - typo - fix spelling of word stubbedkumavis2018-01-184-8/+8
| | * | | | test - remove createEthJsQueryStubkumavis2018-01-182-18/+3
| |/ / / /
| * | | | Merge pull request #3021 from MetaMask/i#3020kumavis2018-01-181-0/+8
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Update transactions.jskumavis2018-01-181-1/+1
| | * | | transactions - transtion approved transactions to failed transactions on bootfrankiebee2018-01-181-0/+8
| |/ / /
| * | | Merge pull request #3019 from MetaMask/i#3015Frankie2018-01-181-2/+22
| |\ \ \ | | |/ / | |/| |
| | * | transactions - fail txs on boot who fail addTxDefaultsfrankiebee2018-01-181-0/+2
| | * | transactions - wrap addTxDefaults in a try catch and re try addTxDefaults on ...frankiebee2018-01-181-2/+20
| |/ /
| * | Merge pull request #3012 from MetaMask/AddNetworkIndicatorClasstoLoadingFrankie2018-01-181-1/+1
| |\ \
| | * | 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
| |/ |/|
* | 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
| |\| | | | |/ | |/|
| * | Merge pull request #2996 from MetaMask/Version-3.13.5Thomas Huang2018-01-172-1/+3
| |\ \
| | * | Version 3.13.5v3.13.5Dan Finlay2018-01-172-1/+3
| |/ /
| * | Merge pull request #2983 from MetaMask/i2907-NoCodeGasLimitkumavis2018-01-172-6/+24
| |\ \
| | * \ Merge branch 'master' into i2907-NoCodeGasLimitDan Finlay2018-01-173-0/+5
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #2929 from MetaMask/i2779-FirefoxSpecifyAccountDetailHeightkumavis2018-01-173-0/+5
| |\ \ \
| | * \ \ Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeightDan Finlay2018-01-176-18/+56
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeightDan Finlay2018-01-1611-29/+116
| | |\ \ \
| | * | | | Edit: Fix Firefox scrollbar ChangelogThomas Huang2018-01-161-1/+1
| | * | | | Bump ChangelogThomas2018-01-161-0/+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
| | | | * | Create new flag for simple sends to avoid overloading other flagDan Finlay2018-01-171-2/+2
| | | | * | Merge branch 'master' into i2907-NoCodeGasLimitkumavis2018-01-176-18/+56
| | | | |\ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #2984 from MetaMask/RenameLockToLogoutThomas Huang2018-01-171-1/+1
| |\ \ \ \ \
| | * | | | | Rename lock to log outDan Finlay2018-01-161-1/+1
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #2962 from MetaMask/open-popupDan Finlay2018-01-165-17/+55
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch 'master' into open-popupFrankie2018-01-169-26/+90
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | add to CHANGELOG.mdfrankiebee2018-01-161-0/+2
| | * | | | test - fix to match expected behaviorfrankiebee2018-01-151-14/+28
| | * | | | test - create ethJsQuery stubfrankiebee2018-01-151-1/+14
| | * | | | transactions - emit 'newUnapprovedTx' before estimateGas finishesfrankiebee2018-01-151-2/+6
| | * | | | add a loading spinner to conf-tx viewfrankiebee2018-01-151-0/+6
| | | | * | Merge branch 'master' into i2907-NoCodeGasLimitDan Finlay2018-01-164-15/+78
| | | | |\ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #2953 from MetaMask/i2826-SignBytesFrankie2018-01-162-4/+3
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into i2826-SignBytesFrankie2018-01-163-11/+75
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #2936 from MetaMask/i2925-BetterGasEstimationDan Finlay2018-01-163-11/+76
| |\ \ \ \ \ \
| | * | | | | | Prefer passing a provider over an ethQuery instanceDan Finlay2018-01-132-8/+4
| | * | | | | | Improve gas price estimation by backfilling recent-blocksDan Finlay2018-01-123-9/+78
| | | * | | | | Merge branch 'master' into i2826-SignBytesDan Finlay2018-01-164-7/+8
| | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | | * | | | | Bump keyringController versionDan Finlay2018-01-161-3/+1
| | | * | | | | Fix signTypedData bytes signingDan Finlay2018-01-142-1/+3
| | | | | | * | Set gas limit to 21k for recipients with no codeDan Finlay2018-01-162-5/+24
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge pull request #2862 from wbt/UpdateNoticeDan Finlay2018-01-162-3/+1
| |\ \ \ \ \ \
| | * | | | | | Cut statement about test network defaultwbt2018-01-051-1/+1
| | * | | | | | Cut statement about test network defaultwbt2018-01-051-2/+0
| * | | | | | | Merge pull request #2900 from MetaMask/infura-rest-apikumavis2018-01-162-4/+7
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Merge branch 'master' into infura-rest-apikumavis2018-01-126-5/+32
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | * | | | | | deps - bump eth-json-infurakumavis2018-01-101-1/+1
| | * | | | | | provider - infura - use infura REST apikumavis2018-01-092-4/+7
| | * | | | | | bugfix - transactions controller - breakout logic and fix order of operations...kumavis2018-01-091-2/+4
| * | | | | | | Merge pull request #2909 from MetaMask/UpdateSupportLinksKevin Serrano2018-01-132-4/+4
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Use httpsDan Finlay2018-01-132-2/+2
| | * | | | | | Merge branch 'UpdateReadmeSupportLink' into UpdateSupportLinksDan Finlay2018-01-136-5/+30
| | |\ \ \ \ \ \
| | | * | | | | | Update support link on readmeDan Finlay2018-01-131-1/+1
| | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #2926 from MetaMask/gulp-npmlsDan Finlay2018-01-122-3/+16
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | build - add 'deps' step that records output of 'npm ls' into buildkumavis2018-01-111-1/+15
| | * | | | | | deps - gulp in dev deps onlykumavis2018-01-111-2/+1
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #2917 from x86kernel/ci/add-ko-localekumavis2018-01-121-0/+10
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | ci(ko/messages.json): add korean localization filex86kernel2018-01-101-0/+10
| |/ / / / /
| * | | | | Merge pull request #2906 from MetaMask/Version-3.13.4Thomas Huang2018-01-102-1/+3
| |\ \ \ \ \
| | * | | | | Version 3.13.4v3.13.4Dan Finlay2018-01-102-1/+3
| |/ / / / /
| | | * / / Update support links for helpscoutDan Finlay2018-01-101-3/+3
| | |/ / / | |/| | |
| * | | | 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 #2902 from MetaMask/DefaultToOneGweiDan Finlay2018-01-091-1/+2
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into DefaultToOneGweiDan Finlay2018-01-091-1/+1
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #2796 from MetaMask/filter-case-sensitiveDan Finlay2018-01-091-1/+1
| |\ \ \ \ \ \
| | * | | | | | deps - eth-json-rpc-filters@1.2.5kumavis2017-12-231-1/+1
| * | | | | | | Merge pull request #2901 from MetaMask/DefaultToOneGweikumavis2018-01-092-0/+25
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #2899 from MetaMask/danfinlay-patch-1kumavis2018-01-091-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Default to estimating 1 gwei for empty blocks.Dan Finlay2018-01-091-1/+1
| |/ / / / / / / /
| | | | * / / / / Default to 1 gwei for empty blocksDan Finlay2018-01-091-2/+3
| | | |/ / / / / | | |/| | | | |
| | * | | | | | Add test for gas estimate defaultDan Finlay2018-01-091-0/+19
| | * | | | | | Default gas estimate to 1 gwei for networks with no block activityDan Finlay2018-01-091-0/+6
| |/ / / / / /
| * | | | | | Merge pull request #2896 from MetaMask/kumavis-patch-2Dan Finlay2018-01-091-2/+4
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | bugfix - transactions controller - breakout logic and fix order of operations...kumavis2018-01-091-2/+4
| |/ / / / /
| * | | | | Merge pull request #2854 from MetaMask/UpdateVinyl-BufferPackagekumavis2018-01-091-1/+1
| |\ \ \ \ \
| | * | | | | Update vinyl-buffer to version 1.0.1Thomas Huang2018-01-041-1/+1
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #2891 from MetaMask/i2621-0xRecipientAddressThomas Huang2018-01-093-0/+44
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into i2621-0xRecipientAddressDan Finlay2018-01-096-2/+57
| | |\ \ \ \ \
| | * | | | | | Account for 0x/empty string address and contract creationThomas2018-01-083-0/+44
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #2851 from MetaMask/i2812-seedworderrorfixKevin Serrano2018-01-094-6/+34
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Update CHANGELOG.mdKevin Serrano2018-01-091-0/+1
| | * | | | | Test for failure of the async methods.Kevin Serrano2018-01-041-2/+20
| | * | | | | Add fix for infinite spinner for incorrect seed phrase.Kevin Serrano2018-01-042-4/+13
| * | | | | | Merge pull request #2879 from MetaMask/ImproveGasEstimationDan Finlay2018-01-096-2/+57
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Fix feature to workDan Finlay2018-01-063-6/+16
| | * | | | | LintedDan Finlay2018-01-061-3/+0
| | * | | | | Bump changelogDan Finlay2018-01-061-0/+1
| | * | | | | Derive gas price estimate from previous transactionsDan Finlay2018-01-064-2/+24
| | * | | | | Add test for better gas estimationDan Finlay2018-01-061-0/+25
| |/ / / / /
* | | | | | 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 #2783 from MetaMask/tx-param-vaalidationkumavis2018-01-032-2/+10
| | |\ \ \ \
| | | * | | | tx-gas-utils - tx-param-validation - use more intuitive checkkumavis2018-01-031-2/+2
| | | * | | | Merge branch 'master' into tx-param-vaalidationFrankie2017-12-225-18/+122
| | | |\ \ \ \
| | | * | | | | SpellingDan Finlay2017-12-221-1/+1
| | | * | | | | add to CHANGELOG.mdfrankiebee2017-12-211-0/+2
| | | * | | | | transactions - throw error if dapp provides txParams whos value has a decimalfrankiebee2017-12-211-2/+9
| | * | | | | | Merge pull request #2840 from oosthuizenr/masterkumavis2018-01-031-5/+6
| | |\ \ \ \ \ \
| | | * | | | | | fix commentoosthuizenr2018-01-031-1/+1
| | | * | | | | | Fixes #2834Renier Oosthuizen2018-01-031-5/+6
| | |/ / / / / /
| | * | | | | | Merge pull request #2801 from MetaMask/greenkeeper/vinyl-source-stream-2.0.0kumavis2018-01-031-1/+1
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | chore(package): update vinyl-source-stream to version 2.0.0greenkeeper[bot]2017-12-231-1/+1
| | | | |_|/ / | | | |/| | |
| | * | | | | Merge pull request #2817 from MetaMask/i#2810Frankie2017-12-292-3/+63
| | |\ \ \ \ \
| | | * | | | | tests - be more verbose in test messagesfrankiebee2017-12-291-2/+2
| | | * | | | | add tests for #_checkIfNonceIsTakenfrankiebee2017-12-281-2/+61
| | | * | | | | transactions:pending - only check nonces of transactions who's from adress ma...frankiebee2017-12-281-1/+2
| | | |/ / / /
| | * | | | | Merge pull request #2818 from MetaMask/i2782-ethroundingerrorDan Finlay2017-12-296-3/+35
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Bump ChangelogKevin Serrano2017-12-281-0/+1
| | | * | | | 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 additional test to ui utils to account for exact wei values.Kevin Serrano2017-12-281-0/+6
| | | * | | | Add backend fix for util in normalizeethstringtowei.Kevin Serrano2017-12-281-0/+3
| | | * | | | Fix some silly linting issues.Kevin Serrano2017-12-282-2/+2
| | | * | | | Add test for edge case.Kevin Serrano2017-12-281-0/+6
| | |/ / / /
* | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 15:07:00 +0800