aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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
* 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
| | * | | | | 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 #2793 from MetaMask/i2681-DoNotFailPendingKevin Serrano2017-12-223-8/+1
| | | |/| |
| | | | * | Remove retryTimePeriod from tx controllerDan Finlay2017-12-221-1/+0
| | | | * | Bump changelogDan Finlay2017-12-221-0/+1
| | | | * | Stop failing pending transactions after any period of timeDan Finlay2017-12-221-7/+0
| | | |/ /
| | | * | Merge pull request #2763 from MetaMask/AddRecentBlocksControllerThomas Huang2017-12-212-14/+69
| | | |\ \
| | | | * | Do not log whole txs in recent block controller.Dan Finlay2017-12-201-1/+8
| | | | * | Add Recent Blocks controllerDan Finlay2017-12-182-14/+62
| | | * | | Merge pull request #2771 from MetaMask/i2173-UpdateTokenValuesThomas Huang2017-12-203-4/+54
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Bump changelogDan Finlay2017-12-191-0/+2
| | | | * | Allow updating token detailsDan Finlay2017-12-191-4/+4
| | | | * | Add failing test for updating token detailsDan Finlay2017-12-191-0/+48
| | | |/ /
| | | * | Merge pull request #2751 from MetaMask/i#2720Thomas Huang2017-12-191-1/+5
| | | |\ \ | | | | |/ | | | |/|
| | | | * Merge branch 'master' into i#2720frankiebee2017-12-162-2/+2
| | | | |\
| | | | * | transactions:gas-utils - handle new type of estimateGas errorfrankiebee2017-12-151-1/+5
| | | * | | Merge pull request #2757 from MetaMask/kumavis-patch-2Thomas Huang2017-12-161-1/+1
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | readme - fix "plugin" to "extension"kumavis2017-12-161-1/+1
| | | |/ /
| | | * | Merge pull request #2755 from MetaMask/testsFrankie2017-12-162-2/+2
| | | |\ \ | | | | |/ | | | |/|
| | | | * Change console.log for opts in _configureInfuraProviderThomas Huang2017-12-161-1/+1
| | | | * Add exit flag to mocha to exit after tests runThomas Huang2017-12-161-1/+1
| | | |/
| | | * Merge pull request #2747 from MetaMask/Version-3.13.3Thomas Huang2017-12-152-1/+4
| | | |\
| | | | * Version 3.13.3v3.13.3Dan Finlay2017-12-152-1/+4
| | | * | 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
| | | * | | Merge pull request #2662 from williamchong007/masterThomas Huang2017-12-151-2/+10
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | fix #1398, prevent injecting xml without xml suffixWilliam Chong2017-12-051-2/+10
| | | * | | Merge pull request #2733 from MetaMask/i2380-ShowNoBalanceThomas Huang2017-12-152-4/+3
| | | |\ \ \
| | | | * | | Bump changelogDan Finlay2017-12-131-0/+2
| | | | * | | Show watched tokens with no balanceDan Finlay2017-12-131-4/+1
| | | * | | | Merge pull request #2744 from MetaMask/infura-block-trackerFrankie2017-12-142-8/+52
| | | |\ \ \ \
| | | | * | | | Revert "Revert "network - for infura networks use the infura block tracker pr...kumavis2017-12-142-8/+51
| | | | * | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into infura-bloc...kumavis2017-12-143-53/+8
| | | | |\ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge pull request #2743 from MetaMask/revert-2741-infura-block-trackerThomas Huang2017-12-142-52/+8
| | | |\ \ \ \ \
| | | | * | | | | Revert "network - for infura networks use the infura block tracker provider"Frankie2017-12-142-52/+8
| | | |/ / / / /
| | | * | | | | Merge pull request #2741 from MetaMask/infura-block-trackerFrankie2017-12-142-8/+52
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge pull request #2740 from MetaMask/i#2729infura-chill-outkumavis2017-12-141-2/+0
| | | |\ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | | * | | | | dont aggresively query account datafrankiebee2017-12-141-2/+0
| | | |/ / / / /
| | | | | * / / deps - bump eth-json-rpc-infurakumavis2017-12-141-1/+1
| | | | |/ / /
| | | | * / / network - for infura networks use the infura block tracker providerkumavis2017-12-142-8/+52
| | | |/ / /
| | | * | | Merge pull request #2718 from MetaMask/ReducePollingIntervalkumavis2017-12-104-3/+11
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Version 3.13.2v3.13.2Dan Finlay2017-12-103-2/+4
| | | | * | Bump changelogDan Finlay2017-12-101-0/+2
| | | | * | Pass polling interval to zero client providerDan Finlay2017-12-101-1/+5
| | | |/ /
| | | * | Merge pull request #2699 from MetaMask/patch-2v3.13.1kumavis2017-12-084-9/+21
| | | |\ \
| | | | * | tx-controller - failed state is a finished statekumavis2017-12-082-7/+9
| | | | * | Version 3.13.1Dan Finlay2017-12-082-1/+3
| | | | * | Bump changelogDan Finlay2017-12-081-0/+2
| | | | * | Do not allow nonces larger than the next valid nonceDan Finlay2017-12-081-0/+4
| | | | * | Merge branch 'master' into patch-2Dan Finlay2017-12-0810-37/+885
| | | | |\ \
| | | | * | | A more expressive wayvicnaum2017-12-071-5/+2
| | | | * | | Fix for #2644 - Specified Nonce isn't usedvicnaum2017-12-071-1/+6
| | | |/ / / | | |/| | |
| | | * | | Merge pull request #2654 from abitrolly/patch-2Kevin Serrano2017-12-071-1/+1
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Download State Logs with .json extensionAnatoli Babenia2017-12-051-1/+1
| | | | |/
| | | * | Merge pull request #2688 from MetaMask/AddPriceBumpv3.13.0Kevin Serrano2017-12-071-1/+3
| | | |\ \
| | | | * | Add 10% price bump to retry attempts.Dan Finlay2017-12-071-1/+3
| | | |/ /
| | | * | Merge pull request #2684 from MetaMask/RetryTransactionDan Finlay2017-12-0710-37/+883
| | |/| |
| | | * | Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into R...Dan Finlay2017-12-072-1/+11
| | | |\ \
| | | | * | Show retry button on submitted transactions greater than 30 seconds, add hove...Alexander Tseung2017-12-072-1/+11
| | | * | | Version 3.13.0Dan Finlay2017-12-072-1/+3
| | | |/ /
| | | * | Bump changelogDan Finlay2017-12-071-0/+2
| | | * | 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-072-2/+13
| | | |/ /
| | | * | Fix retry actionDan Finlay2017-12-072-3/+11
| | | * | View tx after editing state to unconfirmedDan Finlay2017-12-071-1/+9
| | | * | Fix actionDan Finlay2017-12-071-2/+2
| | | * | Add development stateDan Finlay2017-12-071-0/+739
| | | * | 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-075-1/+24
| | |/ /
| | * | Merge pull request #2670 from danjm/MM-2669-tx-retry-exponential-backoffFrankie2017-12-073-23/+88
| | |\ \ | | | |/ | | |/|
| | | * Add tests for exponential backoff code in _resubmitTxDan2017-12-071-17/+63
| | | * Update resubmitPendingTxs tests.Dan2017-12-071-3/+4
| | | * firstRetryBlockNumber defaults to latestBlockNumber if undefined on txMeta in...Dan2017-12-071-1/+1
| | | * Correct note for updateTx after block-update event in transaction.jsDan2017-12-071-1/+1
| | | * Fix undefined latestBlockNumber in _resubmitTxDan2017-12-071-1/+1
| | | * Exponentional backoff on transaction retry in pending-tx-trackerDan2017-12-062-2/+20
| | |/
| | * Merge pull request #2630 from MetaMask/i2624-VersionedNoticesv3.12.1Thomas Huang2017-11-3012-54/+127
| | |\
| | | * Bump changelogDan Finlay2017-11-301-0/+2
| | | * Remove debuggerDan Finlay2017-11-301-1/+0
| | | * Add markdown class to mascara ui markdown fieldDan Finlay2017-11-302-4/+5
| | | * Bump version to 3.12.1Dan Finlay2017-11-301-1/+1
| | | * Fix test referenceDan Finlay2017-11-301-3/+3
| | | * Make notice skipping asyncDan Finlay2017-11-301-3/+3
| | | * Redundantly skip noticesDan Finlay2017-11-301-25/+22
| | | * Make test more resilientDan Finlay2017-11-301-3/+3
| | | * Remove duplicate button declarationDan Finlay2017-11-301-2/+2
| | | * Fix test selectorDan Finlay2017-11-301-0/+1
| | | * Fix migration commentDan Finlay2017-11-301-2/+3
| | | * Accept all notices in integration testsDan Finlay2017-11-301-18/+3
| | | * Fix test to skip screens before privacy noticeDan Finlay2017-11-291-1/+7
| | | * Migrate old data to include firstVersion infoDan Finlay2017-11-293-1/+42
| | | * Bump changelogDan Finlay2017-11-291-0/+1
| | | * LintedDan Finlay2017-11-292-2/+2
| | | * Add seed phrase bounty award noticeDan Finlay2017-11-294-3/+4
| | | * Get notice version filtering working nicelyDan Finlay2017-11-294-24/+38
| | | * Add firstVersion field to notices selectorDan Finlay2017-11-292-1/+5
| | | * Add optional version field to noticesDan Finlay2017-11-293-1/+21
| | * | Merge pull request #2627 from MetaMask/reload-fixkumavis2017-11-304-7/+11
| | |\ \ | | | |/ | | |/|
| | | * Merge branch 'master' of github.com:MetaMask/metamask-plugin into reload-fixkumavis2017-11-302-8/+8
| | | |\ | | | |/ | | |/|
| | * | Merge pull request #2620 from MetaMask/update-depsDan Finlay2017-11-291-7/+7
| | |\ \
| | | * | Update greenkeeper deps for masterThomas Huang2017-11-281-7/+7
| | * | | Merge pull request #2441 from MetaMask/kumavis-patch-3Dan Finlay2017-11-281-1/+1
| | |\ \ \
| | | * | | network controller - warn via log.warnkumavis2017-11-281-1/+1
| | | * | | Update network.jskumavis2017-10-241-1/+1
| | | | | * deps - obs-store@3 + migrate stream plumbingkumavis2017-11-294-7/+11
| | | |_|/ | | |/| |
| | * | | Merge pull request #2605 from MetaMask/i2577-SeedPhraseBugThomas Huang2017-11-284-5/+68
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Bump changelogDan Finlay2017-11-211-0/+1
| | | * | Remove logsDan Finlay2017-11-211-6/+0
| | | * | Get test passingDan Finlay2017-11-211-4/+25
| | | * | Merge branch 'i2577-SeedPhraseBug' into i2577-SeedPhraseBug-TestDan Finlay2017-11-212-5/+34
| | | |\ \
| | | | * | Prevent multiple submissions of first time formDan Finlay2017-11-211-1/+6
| | | | * | Prevent creation of multiple vaultsDan Finlay2017-11-211-31/+20
| | | | * | Add reproduction and mutex codeDan Finlay2017-11-211-2/+37
| | | * | | Add failing test for #2577 Seed Phrase BugDan Finlay2017-11-211-0/+18
| | | |/ /
| | * | | Merge pull request #2607 from MetaMask/i2504-OperaFixThomas Huang2017-11-281-1/+7
| | |\ \ \
| | | * | | Ensure Opera build excludes chromereload fileDan Finlay2017-11-221-1/+7
| | | |/ /
| | * | | Merge pull request #2603 from MetaMask/greenkeeper/react-markdown-3.0.0Thomas Huang2017-11-251-1/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | fix(package): update react-markdown to version 3.0.0greenkeeper[bot]2017-11-201-1/+1
| | * | | Merge pull request #2516 from MetaMask/i2507-DoubleWeb3ErrorThomas Huang2017-11-212-0/+9
| | |\ \ \
| | | * | | Add useful error when duplicate web3 is detected.Dan Finlay2017-11-012-0/+9
| | * | | | Merge pull request #2596 from MetaMask/issue-template-support-linkThomas Huang2017-11-211-3/+3
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Point issue template at new support centerDan Finlay2017-11-181-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 #2540 from doraemondrian/masterThomas Huang2017-11-153-6/+6
| | |\ \ \ | | | |/ / | | |/| |
| | | * | newUnaprovedTx => newUnapprovedTxDora E. Mondrian2017-11-063-6/+6
| | |/ /
| | * | Merge pull request #2508 from watilde/fixes-1192Thomas Huang2017-10-313-2/+4
| | |\ \
| | | * | Use const and fix lint warningsDaijiro Wachi2017-10-311-2/+2
| | | * | Remove warning message when show import pageDaijiro Wachi2017-10-312-0/+2
| | |/ /
| | * | Merge pull request #2291 from MetaMask/gasPriceSpecifiedKevin Serrano2017-10-281-0/+1
| | |\ \
| | | * | Add indicator for specified gas priceKevin Serrano2017-10-061-0/+1
| | * | | Merge pull request #2275 from MetaMask/version-debuggingKevin Serrano2017-10-274-12/+45
| | |\ \ \
| | | * | | Add option to copy directly to clipboard.Kevin Serrano2017-10-271-3/+11
| | | * | | Correct changelog.Kevin Serrano2017-10-271-1/+0
| | | * | | Bump ChangelogKevin Serrano2017-10-271-0/+1
| | | * | | Resolve merge conflictsKevin Serrano2017-10-2772-232/+12470
| | | |\ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge pull request #2489 from MetaMask/3.12.0Frankie2017-10-262-1/+3
| | |\ \ \ \
| | | * | | | 3.12.0v3.12.0kumavis2017-10-262-1/+3
| | |/ / / /
| | | * | | Changelog addition.Kevin Serrano2017-10-101-0/+1
| | | * | | Merge branch 'master' into version-debuggingKevin Serrano2017-10-1021-24/+539
| | | |\ \ \
| | | * | | | Make the function callback friendly.Kevin Serrano2017-10-103-8/+15
| | | * | | | Simplify try catchKevin Serrano2017-10-061-4/+2
| | | * | | | Catch an error if this is not defined.Kevin Serrano2017-10-061-1/+8
| | | * | | | Merge branch 'master' into version-debuggingKevin Serrano2017-10-0615-98/+94
| | | |\ \ \ \
| | | * | | | | lintKevin Serrano2017-10-051-1/+1
generated by cgit (git 2.34.1) at 2024-10-15 18:31:49 +0800