aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | 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
| * | | | | | | | | Further adjustment to maintain APIKevin Serrano2017-10-051-2/+2
| * | | | | | | | | Rename to maintain APIKevin Serrano2017-10-052-2/+8
| * | | | | | | | | Configured for callback-required function.'Kevin Serrano2017-10-053-11/+14
| * | | | | | | | | change global to windowKevin Serrano2017-10-051-1/+1
| * | | | | | | | | Include browser versionKevin Serrano2017-10-051-0/+2
| * | | | | | | | | Include OS versionKevin Serrano2017-10-052-0/+6
| | | | | | | * | | Merge pull request #2587 from danjm/MM-281-currencyinput-in-gas-estimatorDaniel Tsui2017-11-162-5/+8
| | | | | | | |\ \ \
| | | | | | | | * | | Gas customzier does not consider amount when sending tokens.Dan2017-11-161-1/+1
| | | | | | | | * | | Use currency input component in input number, to improve input behaviour in g...Dan2017-11-161-4/+7
| | | | | | | |/ / /
| | | | | | | * | | Show tokens with zero balanceAlexander Tseung2017-11-151-4/+1
| | | | | | | * | | Create single action for updating all of send in redux state.Dan2017-11-155-13/+38
| | | | | | | * | | Allow editing of token transactions.Dan2017-11-152-11/+91
| | | | | | | * | | Fix lint errors.Dan2017-11-154-18/+15
| | | | | | | * | | Allow editing of send ether.Dan2017-11-155-23/+131
| | | | | | | * | | Improve variable name.Dan2017-11-141-2/+2
| | | | | | | * | | Deposit button shows link to faucet on testnet networks.Dan2017-11-141-15/+23
| | | | | | | * | | Cursor pointer and hover background on from and to dropdown items.Dan2017-11-114-0/+15
| | | | | | | * | | Focus amount input when click anywhere in amount field containerDan2017-11-112-0/+4
| | | | | | | * | | Rounding of vals < 0.01 in currency display consistent with master.Dan2017-11-112-2/+3
| | | | | | | * | | LintingThomas Huang2017-11-115-9/+9
| | | | | | | * | | Network loading does not block network loading.Dan2017-11-105-16/+27
| | | | | | | * | | darker backdrop style for modalcjeria2017-11-101-1/+1
| | | | | | | * | | Merge pull request #2549 from danjm/NewUI-flat-send-amount-fixesDaniel Tsui2017-11-082-20/+29
| | | | | | | |\ \ \
| | | | | | | | * | | Calculate max amount for send ether based on minimum gas total.Dan2017-11-082-10/+1
| | | | | | | | * | | Fix amount max for sending token.Dan2017-11-082-10/+28
| | | | | | | |/ / /
| | | | | | | * | | Merge pull request #2510 from danjm/NewUI-flat-token-balanceDaniel Tsui2017-11-0817-82/+387
| | | | | | | |\ \ \
| | | | | | | | * | | Add currency-input component to correct send amount behaviour and move curren...Dan2017-11-083-32/+103
| | | | | | | | * | | Lint fixes.Dan2017-11-075-15/+3
| | | | | | | | * | | Allow sending 0 eth or tokensDan2017-11-071-3/+3
| | | | | | | | * | | Set gas price allows for WEI precision.Dan2017-11-074-10/+30
| | | | | | | | * | | Insufficient balance warning in gas customizer works for send tokenDan2017-11-071-3/+1
| | | | | | | | * | | Adds max amount feature for send tokenDan2017-11-071-5/+12
| | | | | | | | * | | Adds max amount feature for send-etherDan2017-11-075-2/+65
| | | | | | | | * | | Token balance in send state; validating sufficient tokens, validation updates...Dan2017-11-0711-33/+191
| | | | | | | |/ / /
| | | | | | | * | | Merge pull request #2530 from MetaMask/uatChi Kei Chan2017-11-0354-1019/+952
| | | | | | | |\ \ \
| | | | | | | * | | | Fixes width of from and to dropdowns in extension and on mobile views.Dan2017-11-032-2/+3
| | | | | | * | | | | Merge pull request #2518 from MetaMask/mascara-first-screenFrankie2017-11-085-54/+110
| | | | | | |\ \ \ \ \ | | | | | | | |_|/ / / | | | | | | |/| | | |
| | | | | | | * | | | Merge remote-tracking branch 'origin/uat' into mascara-first-screenfrankiebee2017-11-0864-1161/+1296
| | | | | | | |\ \ \ \ | | | | | | | |/ / / / | | | | | | |/| | | |
| | | | | | * | | | | Update classnames for integration tests and add output/index.css to integrati...Dan2017-11-033-38/+25
| | | | | | * | | | | Get current NewUI-flat tests working.Dan2017-11-036-137/+113
| | | | | | * | | | | Merge pull request #2519 from danjm/NewUI-flat-lintfixesThomas Huang2017-11-0357-986/+1158
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | More lint fixesDan2017-11-0233-115/+108
| | | | | | | * | | | | Lint fixes for NewUI-flat.Dan2017-11-0235-726/+703
| | | | | | | | |/ / / | | | | | | | |/| | |
| | | | | | | * | | | Add utility for getting token data; get token data in tx-list even if token h...Dan2017-10-284-29/+89
| | | | | | | * | | | Provide default new account nameAlexander Tseung2017-10-271-63/+78
| | | | | | | * | | | Fix Settings/Info screen being visible on logout (#2490)Alexander Tseung2017-10-272-6/+43
| | | | | | | * | | | Correct rendering of conversions when conversion rate is a token. (#2498)Dan J Miller2017-10-273-20/+52
| | | | | | | * | | | Clear import error state on logout.Dan2017-10-272-0/+5
| | | | | | | * | | | eth_sign warning colorDan2017-10-272-3/+18
| | | | | | | * | | | Change min gas price to 0.1 GWEIDan2017-10-277-31/+68
| | | | | | | * | | | Fix input border rendering on mobileAlexander Tseung2017-10-271-0/+1
| | | | | | | | * | | mascara:create-password - use less words in metamask explanationfrankiebee2017-11-071-1/+1
| | | | | | | | * | | mascara - fix words and enviroment varsfrankiebee2017-11-032-11/+7
| | | | | | | | * | | mascara:first-time - fix wordingfrankiebee2017-11-011-2/+2
| | | | | | | | * | | fix mascara buildfrankiebee2017-11-011-1/+1
| | | | | | | | * | | mascara:first-time - add alpha warning and a about metamask and mascotfrankiebee2017-11-012-47/+107
| | | | | | | | * | | ui - allow optional size for mascotfrankiebee2017-11-011-3/+3
| | | | | | | |/ / / | | | | | | |/| | |
| | | | | | * | | | 4.0.3kumavis2017-10-261-1/+1
| | | | | | * | | | Merge branch 'NewUI-flat' into uatChi Kei Chan2017-10-26117-953/+5652
| | | | | | |\| | |
| | | | | | | * | | Add Token styling fixChi Kei Chan2017-10-262-5/+29
| | | | | | | * | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-264-10/+20
| | | | | | | |\ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #2100 from ChainsawBaby/patch-1Kevin Serrano2017-10-262-3/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bump ChangelogKevin Serrano2017-10-261-0/+1
| * | | | | | | | | | Resolving that ugly merge.Kevin Serrano2017-10-261-3/+7
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #2476 from MetaMask/100MweiMinGasPriceDan Finlay2017-10-263-12/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add labels to clarify warning.Kevin Serrano2017-10-261-4/+4
| * | | | | | | | | | Account for non-submitted mins and maxKevin Serrano2017-10-261-2/+2
| * | | | | | | | | | Add clarifying comment about wei conversion.Kevin Serrano2017-10-261-0/+1
| * | | | | | | | | | Cut out intermediary wei steps.Kevin Serrano2017-10-261-4/+2
| * | | | | | | | | | Remove unneeded toString conversions.Kevin Serrano2017-10-261-2/+2
| * | | | | | | | | | Move upsize conversions for input warning at front of fn.Kevin Serrano2017-10-261-3/+5
| * | | | | | | | | | Fix mismatched decimal/hex conversion in pending-txKevin Serrano2017-10-261-1/+1
| * | | | | | | | | | Remove css build bundle from uatDan Finlay2017-10-261-4491/+0
| * | | | | | | | | | Update changelogDan Finlay2017-10-261-1/+1
| * | | | | | | | | | Resolve merge conflict.Kevin Serrano2017-10-253-1/+4493
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Reduce minimum gas price to 100 MWEIDan Finlay2017-10-253-7/+4499
| * | | | | | | | | | | Fix for gas price to be lowered.Kevin Serrano2017-10-252-11/+13
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #2478 from MetaMask/mascaraHeadersFixFrankie2017-10-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix X-Frame-Options for mascaratmashuang2017-10-251-1/+1
|/ / / / / / / / / / /
| | | | | | | | * | | Allow editing account name in account details modalAlexander Tseung2017-10-267-64/+149
| | | | | | | | * | | Sign Typed Request styling fixesChi Kei Chan2017-10-263-10/+18
| | | | | | | | * | | Signature request fixes.Dan2017-10-264-26/+30
| | | | | | | | * | | Fix Import an Account link not working in Create Account modalAlexander Tseung2017-10-261-6/+10
| | | | | | | | * | | Signature RequestDan2017-10-267-60/+613
| | | | | | | | * | | Fix send token bug.Dan2017-10-261-1/+2
| | | | | | | | * | | Adds revert feature to customize gas modal.Dan2017-10-262-15/+16
| | | | | | | | * | | Add Info sectionAlexander Tseung2017-10-265-6/+173
| | | | | | | | * | | Add GWEI to gas price unitChi Kei Chan2017-10-252-2/+1
| | | | | | | | * | | From and To field cannot be the sameChi Kei Chan2017-10-251-2/+8
| | | | | | | | * | | Fix gas input styling on mobile viewChi Kei Chan2017-10-254-14/+34
| | | | | | | | * | | Update Import Account Help LinkChi Kei Chan2017-10-251-1/+1
| | | | | | | | * | | Show home page when metafox is clickedChi Kei Chan2017-10-252-4/+12
| | | | | | | | * | | Fix alignment on right arrow of confirm tx screensChi Kei Chan2017-10-255-4/+12
| | | | | | | | * | | Fix styling on notification viewChi Kei Chan2017-10-253-3/+12
| | | | | | | | * | | Add ellipsis to super long account nameChi Kei Chan2017-10-251-1/+9
| | | | | | | | * | | Change download to show in Export Private Key ModalChi Kei Chan2017-10-251-2/+2
| | | | | | | | * | | Remove memo inputChi Kei Chan2017-10-252-7/+18
| | | | | | | | * | | Add BuyEtherWidget for future use in buy ether modalChi Kei Chan2017-10-251-0/+197
| | | | | | | | * | | Styling and UX changes on sidebarChi Kei Chan2017-10-252-11/+14
| | | | | | | | * | | Add token list and buy modal alignment fixChi Kei Chan2017-10-253-15/+36
| | | | | | | | * | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-2521-48/+60
| | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #2422 from watilde/fixes-lintKevin Serrano2017-10-2522-49/+55
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix lint warningsDaijiro Wachi2017-10-2220-49/+47
| * | | | | | | | | | Add lint:fix command to gulp and npm-scriptsDaijiro Wachi2017-10-222-0/+8
| | | | | | | | * | | Hide sidebar on add tokenChi Kei Chan2017-10-252-2/+5
| | | | | | | | * | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-2541-163/+2966
| | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #1990 from chikeichan/firsttimeflowThomas Huang2017-10-2536-64/+12257
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add error messages when importing an accounttmashuang2017-10-242-17/+24
| * | | | | | | | | | Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin...tmashuang2017-10-2435-63/+12249
|/| | | | | | | | | |
| * | | | | | | | | | Add Import With Seed PhraseChi Kei Chan2017-10-216-19/+156
| * | | | | | | | | | Add mobile responsivenessChi Kei Chan2017-10-212-177/+192
| * | | | | | | | | | Remove import optionChi Kei Chan2017-10-211-1/+3
| * | | | | | | | | | Fix importChi Kei Chan2017-10-211-21/+31
| * | | | | | | | | | Fix capitializationChi Kei Chan2017-10-211-1/+1
| * | | | | | | | | | Add Integration TestsChi Kei Chan2017-10-214-15/+61
| * | | | | | | | | | Fixing integraiton testChi Kei Chan2017-10-212-3/+130
| * | | | | | | | | | Fix unit testChi Kei Chan2017-10-212-2/+3
| * | | | | | | | | | Fix linterChi Kei Chan2017-10-2110-123/+245
| * | | | | | | | | | ShapeShift IntegrationChi Kei Chan2017-10-216-90/+287
| * | | | | | | | | | Add ShapeShift UIChi Kei Chan2017-10-216-80/+353
| * | | | | | | | | | Fix merge conflict; separate onboarding buy screenChi Kei Chan2017-10-218-29/+9558
| * | | | | | | | | | Add missing presetsChi Kei Chan2017-10-211-0/+1
| * | | | | | | | | | Move "Skip this step" to side panelJacky Chan2017-10-212-12/+17
| * | | | | | | | | | Disable CTA unless notice is scrolled to bottomJacky Chan2017-10-212-4/+29
| * | | | | | | | | | Fix Buy Ether flowJacky Chan2017-10-212-2/+5
| * | | | | | | | | | Shuffle tokensJacky Chan2017-10-214-25/+44
| * | | | | | | | | | Add Go to Coinbase; Show Buy Ether after signupJacky Chan2017-10-2110-74/+125
| * | | | | | | | | | Hide Warning after changing import optionsJacky Chan2017-10-212-5/+10
| * | | | | | | | | | Implement Buy Ether Screen UIJacky Chan2017-10-213-8/+318
| * | | | | | | | | | Implement Import Account ScreenJacky Chan2017-10-215-16/+328
| * | | | | | | | | | Add BackupPhraseScreenJacky Chan2017-10-216-14/+406
| * | | | | | | | | | Add NoticeScreenJacky Chan2017-10-214-20/+119
| * | | | | | | | | | Add UniqueImageScreenJacky Chan2017-10-2110-64/+329
| * | | | | | | | | | Add BreadcrumbsJacky Chan2017-10-213-2/+47
| * | | | | | | | | | CreatePasswordScreenJacky Chan2017-10-214-3/+105
| * | | | | | | | | | Adding CreatePasswordScreenJacky Chan2017-10-216-2/+95
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #2429 from MetaMask/i2428-AltEnsTldsFrankie2017-10-244-2/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Try to fix intermittent test failure in NonceTracker testsDan Finlay2017-10-231-0/+4
| * | | | | | | | | | Add support for alternative ENS TLDsDan Finlay2017-10-232-1/+3
| * | | | | | | | | | Version 3.11.2v3.11.2Dan Finlay2017-10-222-1/+6
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #2423 from MetaMask/json-rpc-fixThomas Huang2017-10-221-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Temporarily reversal of json-rpc-engineKevin Serrano2017-10-221-1/+1
|/ / / / / / / / /
generated by cgit (git 2.34.1) at 2024-10-17 23:21:55 +0800