aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Enable mobile sync (#6332)Bruno Barbieri2019-03-223-9/+2
* Stop reloading dapps on network change allowing dapps to decide if it should ...Josh Stevens2019-03-222-0/+8
* Fixing spelling of Ethereum in MetaMetrics copy (#6329)fixanoid2019-03-212-2/+2
* Merge pull request #6327 from MetaMask/eth-contract-metadataWhymarrh Whitby2019-03-212-376/+153
|\
| * Bump gaba version to avoid broken eth-contract-metadataWhymarrh Whitby2019-03-212-376/+153
|/
* Add rollback script, move auto-changelog script (#6252)Dan Finlay2019-03-204-5/+41
* Fix typos in English messages (#6317)Thomas Huang2019-03-191-2/+2
* Fixes popups not showing when screen size is odd (#6312)William Monti Souza2019-03-181-2/+2
* Centre the notification in the current window (#6307)Whymarrh Whitby2019-03-151-4/+3
* Merge pull request #6298 from whymarrh/node-8.15.1Whymarrh Whitby2019-03-132-18/+18
|\
| * ci: Skip updating npm@6 as it is defaultWhymarrh Whitby2019-03-131-2/+2
| * Update Node minor versionWhymarrh Whitby2019-03-132-16/+16
* | Merge pull request #6213 from whymarrh/seed-phrase-newlineWhymarrh Whitby2019-03-131-1/+1
|\ \ | |/ |/|
| * Allow seed phrases with a trailing newlineWhymarrh Whitby2019-03-131-1/+1
|/
* Patch/bump version (#6294)v6.2.2Thomas Huang2019-03-132-2/+9
* Merge pull request #6281 from MetaMask/fix-browser-back-on-reveal-seedThomas Huang2019-03-131-2/+2
|\
| * Fixes the use of the browser back button on the reveal seed screenDan Miller2019-03-121-2/+2
* | Merge pull request #6292 from whymarrh/npm-cikumavis2019-03-121-8/+1
|\ \
| * | ci: Use npm ci for fast(er) installsWhymarrh Whitby2019-03-121-8/+1
* | | build - babel - move config to babelrc (#6284)kumavis2019-03-122-26/+23
* | | Merge pull request #6271 from whymarrh/centre-notificatonskumavis2019-03-121-5/+10
|\ \ \ | |/ / |/| |
| * | Centre all notification popupsWhymarrh Whitby2019-03-121-5/+10
* | | Improve Korean translations (#6268)bowbowbow2019-03-121-29/+350
* | | ui - add missing PropTypes (#6287)kumavis2019-03-122-0/+3
|/ /
* | circleci - disable npm dep cache (#6288)kumavis2019-03-121-7/+7
* | mascara - remove from project (#6283)kumavis2019-03-1233-726/+24
* | Merge pull request #6289 from whymarrh/fix-ci-depskumavis2019-03-122-448/+1224
|\ \
| * | npm i -D ganache-core@2.5.3Whymarrh Whitby2019-03-122-368/+984
| * | Allow npm to update the package-lock.json fileWhymarrh Whitby2019-03-121-90/+250
|/ /
* | ci: Use cache version from circle environment var (#6286)kumavis2019-03-121-2/+2
* | GABA: Integrate AddressBookController (#5847)Paul Bouchon2019-03-126-221/+532
* | Merge pull request #6279 from MetaMask/notification-windowThomas Huang2019-03-121-1/+1
|\ \
| * | Nonmultiple notifications for batch txsThomas Huang2019-03-121-1/+1
* | | Merge pull request #6280 from MetaMask/network-checksum-disableThomas Huang2019-03-121-2/+1
|\ \ \
| * | | Remove line rather than comment outThomas Huang2019-03-121-4/+0
| * | | No longer check network when validating checksum addressesThomas Huang2019-03-121-2/+5
* | | | Version 6.2.1 (#6251)Thomas Huang2019-03-122-1/+3
|/ / /
* | / development - enhancement for sourcemap validator tool (#6277)kumavis2019-03-121-22/+71
| |/ |/|
* | Merge pull request #6261 from Pedro-vk/patch-1Thomas Huang2019-03-081-18/+18
|\ \ | |/ |/|
| * Uppercase and context fixes on Spanish translation.Pedro Gutiérrez2019-03-071-18/+18
|/
* Handle undefined gas limits and prices in transaction-breakdown.component (#6...Dan J Miller2019-03-072-21/+38
* Add privacy policy link to modal metrics opt-in (#6250)Dan J Miller2019-03-071-1/+7
* Prevent advanced gas input arrows from setting value to < 0 (#6248)Dan J Miller2019-03-072-4/+24
* Only call onRecipient and onSender methods if defined in sender-to-recipient ...Dan J Miller2019-03-071-2/+6
* Fix missing this reference in addtoken button onclick method (#6245)Dan J Miller2019-03-061-1/+2
* Fixes the 'Percentages row tracks and gutters' decpracation warning. (#6244)Dan J Miller2019-03-061-1/+1
* Version 6.2.0 (#6239)v6.2.0Dan J Miller2019-03-062-1/+7
* Metametrics fixes (#6238)Dan J Miller2019-03-066-38/+43
* Merge pull request #6237 from MetaMask/metrics-descriptionThomas Huang2019-03-062-2/+2
|\
| * Wrap in spanThomas Huang2019-03-061-1/+1
| * Fix typoThomas Huang2019-03-061-1/+1
|/
* Fix MetaMetrics Environment Check (#6235)Dan J Miller2019-03-061-1/+1
* Metametrics (#6171)Dan J Miller2019-03-0594-162/+2203
* Merge pull request #6223 from MetaMask/fix-6221Thomas Huang2019-03-051-1/+1
|\
| * SimplifyThomas Huang2019-03-051-1/+1
| * ImprovementThomas Huang2019-03-011-1/+1
| * Show popup if notification or activeMMtab is true but not if popup is openThomas Huang2019-03-011-1/+1
* | bump trezor-connect to v7 (#6224)Bruno Barbieri2019-03-052-37/+46
|/
* First time flow updates (#6192)Dan J Miller2019-02-2741-528/+763
* Show/Hide Fiat on Testnets based on User Preference (#6153)Chi Kei Chan2019-02-2739-113/+1169
* Merge pull request #6190 from whymarrh/tmp.RvdXXs4ikumavis2019-02-261-1/+0
|\
| * Remove public property from package.json fileWhymarrh Whitby2019-02-211-1/+0
* | Feature Flag + Mobile Sync (#5955)Dan Finlay2019-02-2618-78/+760
* | Fix gas estimation when sending to contracts (#6195)Dan J Miller2019-02-266-8/+16
* | Merge pull request #6166 from whymarrh/bye-bye-old-uiWhymarrh Whitby2019-02-21127-20282/+12
|\ \
| * | Remove unused CI jobs, rename e2e beta jobsWhymarrh Whitby2019-02-212-16/+12
| * | Remove outdated ui dev and ui mock docsWhymarrh Whitby2019-02-214-18/+0
| * | Delete old-ui folderWhymarrh Whitby2019-02-21121-20248/+0
| |/
* / account tracker - update accounts from balanceChecker contract (#6181)Jenny Pollack2019-02-213-3/+70
|/
* Disable npm audit (#6188)Thomas Huang2019-02-211-13/+13
* fix: update README to add a missing " " space (#6191)Alon Bukai2019-02-211-1/+1
* EIP-1193: standard provider API (#6170)Paul Bouchon2019-02-209-23/+138
* Merge pull request #6184 from chikeichan/6132Dan J Miller2019-02-202-1/+26
|\
| * turn camcelCase method name to space separatedChi Kei Chan2019-02-192-1/+26
* | Merge pull request #6185 from chikeichan/5681Dan J Miller2019-02-201-5/+0
|\ \
| * | Remove password check when importing Account JSONChi Kei Chan2019-02-191-5/+0
| |/
* | Merge pull request #6183 from chikeichan/5171Dan J Miller2019-02-201-1/+1
|\ \
| * | Bring Popup to front when ui is tiggeredChi Kei Chan2019-02-191-1/+1
| |/
* | Merge pull request #6187 from MetaMask/Version-6.1.0Thomas Huang2019-02-204-1/+56
|\ \
| * | Add sensitive publishing protocolv6.1.0Dan Finlay2019-02-202-0/+47
| * | Version 6.1.0 RC1Dan Finlay2019-02-202-1/+9
|/ /
* / Change "Token Address" to "Token Contract Address" (#6182)Chi Kei Chan2019-02-202-1/+4
|/
* Fix inpage.js event handler memory leak (#6177)Graham Kaemmer2019-02-191-4/+5
* Add Copy Tx ID button to transaction-list-item-details (#6146)Chi Kei Chan2019-02-174-2/+42
* Merge pull request #6164 from whymarrh/delete-travis-configWhymarrh Whitby2019-02-151-13/+0
|\
| * Delete unused Travis CI configWhymarrh Whitby2019-02-151-13/+0
|/
* Merge pull request #6137 from whymarrh/es6-backgroundWhymarrh Whitby2019-02-148-32/+32
|\
| * Update popup-core script to use ES6 destructuring, const, letWhymarrh Whitby2019-02-121-6/+6
| * Update platforms/extension to use ES6 destructuring requiresWhymarrh Whitby2019-02-121-1/+1
| * Update phishing-detect script to use ES6 destructuring requiresWhymarrh Whitby2019-02-121-1/+1
| * Update NoticesController to use ES6 destructuring, const, letWhymarrh Whitby2019-02-121-3/+3
| * Update MetaMaskController to use ES6 destructuring, const, letWhymarrh Whitby2019-02-121-5/+5
| * Fix all "var used instead of let or const" problems in inpage.jsWhymarrh Whitby2019-02-121-4/+4
| * Update contentscript to use ES6 destructuring, const, letWhymarrh Whitby2019-02-121-5/+5
| * Fix all "var used instead of let or const" problems in background.jsWhymarrh Whitby2019-02-121-7/+7
* | Checksum address before slicing it for the confirm screen (#6133)Whymarrh Whitby2019-02-141-2/+6
* | Fixed issue #5838 (#6001)Jonathan Smirnoff2019-02-1414-18/+46
* | Adds tests for advanced gas controls on confim screen (#6144)Dan J Miller2019-02-131-1/+47
* | Add button to force edit token symbol when adding custom token (#6147)Chi Kei Chan2019-02-132-2/+38
* | Merge pull request #6124 from MetaMask/dissable-recent-block-controllerThomas Huang2019-02-133-4/+30
|\ \
| * | fix typofrankiebee2019-02-131-4/+4
| * | recent-blocks - dont listen for block when on infura providersfrankiebee2019-02-123-4/+30
* | | Version 6.0.1 (#6141)v6.0.1Whymarrh Whitby2019-02-132-1/+9
* | | Merge pull request #6139 from whymarrh/fix-confirm-advanced-gasWhymarrh Whitby2019-02-121-1/+1
|\ \ \
| * | | Fix advanced gas controls on the confirm screenWhymarrh Whitby2019-02-121-1/+1
| | |/ | |/|
* | | Merge pull request #6134 from whymarrh/first-time-seed-whitespaceWhymarrh Whitby2019-02-121-2/+4
|\ \ \ | |/ / |/| |
| * | Trim whitespace from seed phrase during importWhymarrh Whitby2019-02-121-2/+4
* | | Update Italian translation (#6119)matteopey2019-02-121-40/+277
* | | Improved Traditional Chinese translation (#6125)S.C. Chen2019-02-121-102/+735
|/ /
* | Version 6 RC1 (#6117)Dan Finlay2019-02-122-1/+12
* | Merge pull request #6131 from MetaMask/docs-patchWhymarrh Whitby2019-02-121-0/+1
|\ \ | |/ |/|
| * Add native deps compilation troubleshooting to docsWhymarrh Whitby2019-02-111-0/+1
|/
* Merge pull request #6122 from whymarrh/fix-gas-editingWhymarrh Whitby2019-02-097-76/+147
|\
| * Add e2e tests adjusting gas before sendingWhymarrh Whitby2019-02-092-12/+96
| * Fix inline advanced gas editingWhymarrh Whitby2019-02-096-64/+51
* | Fix locale codes contains underscore will never be preferred (#6116)S.C. Chen2019-02-091-4/+11
|/
* Merge pull request #6121 from whymarrh/audit-depsWhymarrh Whitby2019-02-091-12/+40
|\
| * Fix 1 moderate severity vulnerability with depsWhymarrh Whitby2019-02-081-12/+40
* | implement class for sign footer button (#6120)Brandon Wissmann2019-02-081-0/+1
|/
* Set custom gas data in state from inline advance gas controls on send screen ...Dan J Miller2019-02-072-2/+11
* Add Swap feature to CurrencyInput (#6091)Chi Kei Chan2019-02-068-45/+152
* Change gas labels to Slow/Average/Fast (#6090)Chi Kei Chan2019-02-062-60/+60
* Add togglable advanced gas controls on send and confirm screens (#6112)Dan J Miller2019-02-0620-36/+609
* Merge pull request #5929 from whymarrh/phishing-redesignWhymarrh Whitby2019-02-063-77/+465
|\
| * Update design of phishing warning screenWhymarrh Whitby2019-02-063-77/+465
|/
* Merge pull request #6082 from whymarrh/migrate-to-new-uiWhymarrh Whitby2019-02-0525-229/+177
|\
| * Add announcement for users migrated to the new UIWhymarrh Whitby2019-02-0515-50/+122
| * Remove betaUI preference state, replace with completedUiMigrationWhymarrh Whitby2019-02-053-9/+42
| * Default to the new UI for all usersWhymarrh Whitby2019-02-056-116/+13
| * Remove commented references to Beta UIWhymarrh Whitby2019-02-051-18/+0
| * Remove "Use old UI" settingWhymarrh Whitby2019-02-052-37/+1
|/
* Version 5.3.5 (#6109)v5.3.5Whymarrh Whitby2019-02-052-1/+5
* Privacy mode fixes (#6087)Bruno Barbieri2019-02-022-14/+16
* Version 5.3.4 RC1 (#6084)Dan Finlay2019-02-012-1/+5
* fix - migration 30 undefinds (#6079)Frankie2019-02-011-16/+18
* Merge pull request #6076 from MetaMask/Version-5.3.3Thomas Huang2019-01-312-1/+8
|\
| * Version 5.3.3 RC1v5.3.3Dan Finlay2019-01-312-1/+8
|/
* EIP-1102 updates (#6006)Paul Bouchon2019-01-318-42/+49
* Remove unused InitializeMenuScreen component (#6075)Whymarrh Whitby2019-01-311-224/+0
* Improved Spanish translations (#6072)Pedro Gutiérrez2019-01-311-13/+13
* Merge pull request #6074 from MetaMask/ui-codeownersWhymarrh Whitby2019-01-301-1/+1
|\
| * Update UI codeownersWhymarrh Whitby2019-01-301-1/+1
|/
* e2e: Use close instead of save for gas modal (#6066)Thomas Huang2019-01-301-1/+2
* Add visual indicator when displaying a cached balance (#5854)Dan J Miller2019-01-3022-31/+161
* I#5956 fix2 dont overwrite existing rpc settings (#6044)Frankie2019-01-307-9/+85
* Version 5.3.2 RC1 (#6069)Dan Finlay2019-01-292-1/+10
* Merge pull request #6021 from MetaMask/i5943-shapeshift-txDan J Miller2019-01-264-50/+1028
|\
| * Fix bugs in e2e tests related to gas customization inputs.Dan Miller2019-01-251-14/+17
| * Add integration test for ordering of shapeshift txs in history list.Dan Miller2019-01-252-8/+227
| * Fix integration testsAlexander Tseung2019-01-252-20/+756
| * Order shapeshift transactions by time within the transactions listAlexander Tseung2019-01-251-12/+32
* | add source for header in create infura client (#6023)Jenny Pollack2019-01-252-679/+266
|/
* Prevent send to token warning (#6058)Esteban Miño2019-01-2428-15/+256
* Refactor first time flow, remove seed phrase from state (#5994)Alexander Tseung2019-01-23114-3002/+2722
* Updated Spanish translations (#6046)oliver renwick2019-01-231-3/+577
* Prevent send to token (#6051)Esteban Miño2019-01-239-3/+66
* fix asset detection (#6049)Bruno Barbieri2019-01-233-7/+45
* Use Parity on-chain registry only when is needed (#6052)Esteban Miño2019-01-237-6/+61
* Refactor BalanceComponent to jsx (#6048)Alexander Tseung2019-01-216-250/+121
* I#5956 fix 1 (#6026)Frankie2019-01-185-1/+93
* Fix grammar error in Current Conversion (#6029)Alexander Tseung2019-01-172-3/+3
* Merge pull request #6027 from MetaMask/Version-5.3.1Thomas Huang2019-01-172-1/+14
|\
| * Merge branch 'develop' into Version-5.3.1v5.3.1Dan Finlay2019-01-171-18/+18
| |\
| * | Version 5.3.1 RC2Dan Finlay2019-01-172-1/+14
* | | Disable account dropdown on signing screens (#6024)Alexander Tseung2019-01-175-85/+195
| |/ |/|
* | Skip drizzle tests unit issue with ci is determined (#5982)Thomas Huang2019-01-171-18/+18
|/
* Merge pull request #5966 from filips123/patch-1Thomas Huang2019-01-111-3/+180
|\
| * Merge branch 'develop' of https://github.com/MetaMask/metamask-extension into...Filip Š2019-01-1017-278/+445
| |\
| * | Update Slovenian translationFilip Š2018-12-261-3/+180
* | | Set auto conversion off for token/eth conversion (#6005)Thomas Huang2019-01-111-1/+1
* | | Fix confirm screen for sending ether tx with hex data (#6008)Alexander Tseung2019-01-111-0/+6
| |/ |/|
* | Merge pull request #5999 from MetaMask/app-descriptionThomas Huang2019-01-061-1/+1
|\ \
| * | Refine app descriptionDan Finlay2019-01-061-1/+1
|/ /
* | Merge pull request #5997 from whymarrh/drizzle-scriptThomas Huang2019-01-051-9/+24
|\ \
| * | Clean up drizzle test runner scriptWhymarrh Whitby2019-01-041-10/+21
| * | Revert "remove error flags from drizzle setup"Whymarrh Whitby2019-01-041-0/+4
|/ /
* | Fix ERC20 token value decoding (#5995)Hsuan Lee2019-01-041-1/+1
* | Merge pull request #5970 from Wathis/developVincent2019-01-041-6/+6
|\ \
| * | Wrong french translationWathis2019-01-041-6/+6
|/ /
* | Fix Component#componentDidUpdate usage (#5977)Bowen2019-01-041-3/+3
* | Merge pull request #5987 from MetaMask/Version-5.3.0Thomas Huang2019-01-042-1/+10
|\ \
| * | Version 5.3.0 RC1v5.3.0Dan Finlay2019-01-032-1/+10
* | | Merge pull request #5992 from MetaMask/i5140-accountsThomas Huang2019-01-048-255/+398
|\ \ \
| * | | Add scrolling button to account listAlexander Tseung2019-01-048-255/+398
| |/ /
* | | Merge pull request #5989 from smiled0g/developThomas Huang2019-01-041-1/+1
|\ \ \ | |/ / |/| |
| * | fix typo in phishing.html titlePaul Chonpimai2019-01-031-1/+1
|/ /
* | Merge pull request #5986 from MetaMask/fix-etherscan-againThomas Huang2019-01-031-1/+1
|\ \
| * | fix extension linkbrunobar792019-01-031-1/+1
|/ /
* | Merge pull request #5978 from MetaMask/fix-etherscan-link-notificationsBruno Barbieri2019-01-031-1/+1
|\ \
| * \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into fix-eth...brunobar792019-01-031-3/+3
| |\ \ | |/ / |/| |
* | | Merge pull request #5980 from MetaMask/fix-drizzle-testsThomas Huang2019-01-031-3/+3
|\ \ \ | |_|/ |/| |
| * | remove --unsafe-permBruno Barbieri2019-01-031-1/+1
| * | no globalsBruno Barbieri2019-01-031-3/+3
| * | Use sudo consistentlyBruno Barbieri2019-01-031-2/+2
| * | --unsafe-perm ?Bruno Barbieri2019-01-031-1/+1
| * | Dont use sudo to install truffleBruno Barbieri2019-01-011-1/+1
|/ /
| * Fix etherscan links on notificationsBruno Barbieri2018-12-291-1/+1
|/
* Prevent users from changing the From field in the send screen (#5922)Alexander Tseung2018-12-1426-464/+1306
* Fix displayed time and date in the activity log. Remove vreme library, add lu...Alexander Tseung2018-12-147-205/+192
* Disallow loading as metamaskNetworkId (#5924)Frankie2018-12-142-3/+14
* Merge pull request #5893 from MetaMask/loading-network-screenDan J Miller2018-12-1415-38/+341
|\
| * Clean up for the loading-network-screenDan Miller2018-12-134-33/+30
| * Improve styling of loading retry / error screenDan Miller2018-12-131-0/+6
| * Adds network loading retry / error screen.Dan Miller2018-12-1311-4/+268
| * Add identifier of private network to the network loading screen message.Dan Miller2018-12-134-7/+23
| * Add spinner and dropdown arrow to network indicator on custom network loading.Dan Miller2018-12-132-27/+47
* | Merge pull request #5926 from MetaMask/Version-5.2.2Thomas Huang2018-12-132-1/+7
|\ \
| * | Version 5.2.2 RC1v5.2.2Dan Finlay2018-12-132-1/+7
|/ /
* | Fix speed up button not showing for transactions with the lowest nonce (#5925)Alexander Tseung2018-12-131-3/+3
* | Merge pull request #5923 from MetaMask/phishing-text-linkThomas Huang2018-12-131-2/+1
|\ \
| * | Update the Phishing Warning notice text to not use inline URLsWhymarrh Whitby2018-12-131-2/+1
| |/
* / Make docs links consistent (#5920)Dan Finlay2018-12-132-22/+14
|/
* Merge pull request #5919 from MetaMask/gas-customization-fixesDan J Miller2018-12-1310-26/+60
|\
| * Show transaction fee instead of total fee in top left of gas customization mo...Dan Miller2018-12-134-9/+9
| * Fix width of gas customization model in notification viewDan Miller2018-12-132-3/+4
| * Add missing translation to the gas customization component.Dan Miller2018-12-136-14/+47
* | Version 5.2.1 RC1 (#5918)v5.2.1Dan J Miller2018-12-132-1/+5
|/
* Merge pull request #5917 from MetaMask/correct-gas-limit-from-external-txDan J Miller2018-12-126-11/+23
|\
| * Ensures that advanced tab gas limit reflects tx gas limitDan Miller2018-12-126-11/+23
|/
* Add submitDisabled prop to Modals. Disable submit button when creating a canc...Alexander Tseung2018-12-124-2/+44
* Merge pull request #5902 from MetaMask/i5846-ProviderCrashesThomas Huang2018-12-124-468/+1057
|\
| * Merge pull request #5908 from MetaMask/i5846-ProviderCrashes-changelogThomas Huang2018-12-122-2/+9
| |\
| | * Changelog and version bump for 5.2.0Dan Miller2018-12-122-2/+9
| |/
| * Merge branch 'develop' into i5846-ProviderCrashesDan Finlay2018-12-1115-68/+395
| |\
| * | Bump package lock, mostly to https linksDan Finlay2018-12-111-465/+1047
| * | Bump json-rpc-engine to v4.0.0Dan Finlay2018-12-111-1/+1
* | | Show Failed transaction in the browser notification for on-chain failures (#5...Alexander Tseung2018-12-111-4/+7
| |/ |/|
* | Improve ux for low gas price set (#5862)Dan J Miller2018-12-1115-68/+395
|/
* fix formatting of 32-byte strings in personal_sign (#5878)Noah Zinsmeister2018-12-102-1/+2
* Group transactions by nonce (#5886)Alexander Tseung2018-12-1047-373/+1208
* Merge pull request #5892 from MetaMask/fix-net-version-race-conditionThomas Huang2018-12-081-4/+10
|\
| * Fix race condition in network controller lookup() method.Dan Miller2018-12-071-4/+10
* | Merge pull request #5890 from whymarrh/pl-i18nWhymarrh Whitby2018-12-081-0/+9
|\ \
| * | Fill in more Polish message translationsWhymarrh Whitby2018-12-061-0/+9
* | | Merge pull request #5891 from whymarrh/npm-auditWhymarrh Whitby2018-12-075-2552/+2542
|\ \ \ | |/ / |/| |
| * | Deduplicate package.json fileWhymarrh Whitby2018-12-072-322/+1042
| * | Update ganache-core to mitigate vulnWhymarrh Whitby2018-12-072-1262/+1092
| * | npm uninstall openWhymarrh Whitby2018-12-072-7/+0
| * | Remove beefy dependency and its usagesWhymarrh Whitby2018-12-073-504/+14
| * | circleci: Replace nsp with npm auditWhymarrh Whitby2018-12-074-579/+253
| * | npm audit fixWhymarrh Whitby2018-12-062-452/+392
| * | circleci: Disable npm audit when installing packagesWhymarrh Whitby2018-12-061-1/+1
| * | Update lockfile to fix errorsWhymarrh Whitby2018-12-061-11/+334
|/ /
* | Merge pull request #5882 from whymarrh/fix-main-container-wrapper-heightWhymarrh Whitby2018-12-061-1/+2
|\ \ | |/ |/|
| * Replace height: 100% rule with workaround for flexbox quirksWhymarrh Whitby2018-12-061-1/+2
|/
* Merge pull request #5704 from MetaMask/new-gas-customize-feature-branch-dDan J Miller2018-12-05104-264/+7147
|\
| * Fix styling of send screen in extension view when hex data on.Dan Miller2018-12-044-12/+17
| * Final gas customization fixesDan Miller2018-12-0418-104/+198
| * Clear custom gas data on hiding of gas customization modal.Dan Miller2018-12-041-4/+12
| * Modify results of API data to better fit gas chart: remove outliers, pad dataDan Miller2018-12-045-44/+126