aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Modify USER_AGREEMENT to be formatted properly.Kevin Serrano2016-10-051-36/+37
* Implemented scroll-to-bottom functionality for button activation.Kevin Serrano2016-10-051-2/+10
* Merge branch 'master' into tosKevin Serrano2016-10-039-20/+36
|\
| * Merge pull request #689 from MetaMask/i#688Dan Finlay2016-10-022-1/+4
| |\
| | * Fix for readabilityFrankie2016-10-021-1/+1
| | * Add to CHANGELOGFrankie2016-10-011-0/+2
| | * Fix issue #688 where fiat conversion does not persist when switching networksFrankie2016-10-011-1/+2
| |/
| * Merge pull request #684 from MetaMask/Version2.13.1Dan Finlay2016-09-233-3/+7
| |\
| | * Version 2.13.12.13.1Dan Finlay2016-09-233-3/+7
| |/
| * Merge pull request #677 from MetaMask/i675-LoadingBuyDan Finlay2016-09-226-17/+18
| |\
| | * Merge branch 'master' into i675-LoadingBuyDan Finlay2016-09-224-2/+10
| | |\ | | |/ | |/|
| * | Merge pull request #678 from MetaMask/ParityComplianceDan Finlay2016-09-224-2/+10
| |\ \
| | * | Version 2.13.0Dan Finlay2016-09-192-2/+4
| | * | Bump web3 provider engine version for Parity complianceDan Finlay2016-09-191-1/+1
| | * | Drop origin key from requests for Parity compatibilityDan Finlay2016-09-192-0/+6
| |/ /
| | * Space out purchase details on ShapeShift formDan Finlay2016-09-162-6/+5
| | * Merge branch 'master' into i675-LoadingBuyDan Finlay2016-09-162-4/+17
| | |\ | | |/ | |/|
| | * Show loading indication when selecting ShapeShiftDan Finlay2016-09-164-11/+14
* | | Merge branch 'master' into tosKevin Serrano2016-09-1913-32/+114
|\| |
| * | Merge pull request #676 from MetaMask/tx-vizDan Finlay2016-09-162-4/+18
| |\ \ | | |/ | |/|
| | * Fix CHANGELOG.md and restructure onClick eventsFrankie2016-09-162-18/+13
| | * lintingFrankie2016-09-161-21/+22
| | * Merge branch 'master' into tx-vizFrankie2016-09-1611-20/+88
| | |\ | | |/ | |/|
| * | Merge pull request #673 from MetaMask/i#519buyButtonTxConfDan Finlay2016-09-1611-20/+88
| |\ \
| | * | Clean up some of the codeFrankie2016-09-162-28/+18
| | * | bump changelogkumavis2016-09-161-0/+1
| | * | css - smaller balance warningkumavis2016-09-161-1/+6
| | * | confTx - add insufficient balance warning messagekumavis2016-09-161-4/+6
| | * | soften lint warningskumavis2016-09-161-2/+2
| | * | confTx - show disabled accept btn + add colorskumavis2016-09-162-37/+49
| | * | Merge branch 'master' into i#519buyButtonTxConfFrankie2016-09-165-27/+30
| | |\ \ | | |/ / | |/| |
| | * | Drop the buy button in the confTx view if account does not have enough ethFrankie2016-09-167-13/+71
| | * | Change Testfaucet urlFrankie2016-09-161-1/+1
| | | * Add to CHANGELOG.mdFrankie2016-09-161-0/+3
| | | * add tx-viz link to transaction historyFrankie2016-09-161-12/+27
| | |/ | |/|
| * | Merge pull request #671 from MetaMask/UpdateGlobalRefsDan Finlay2016-09-151-8/+8
| |\ \
| | * | Remove logsDan Finlay2016-09-151-2/+0
| | * | Merge branch 'master' into UpdateGlobalRefsDan Finlay2016-09-150-0/+0
| | |\ \ | | |/ / | |/| |
| | * | Merge pull request #669 from MetaMask/Version-2.12.1Dan Finlay2016-09-153-10/+14
| | |\ \
* | | | | Modify terms.Kevin Serrano2016-09-191-2/+2
* | | | | Merge branch 'master' into tosKevin Serrano2016-09-155-20/+23
|\| | | |
| * | | | Merge pull request #669 from MetaMask/Version-2.12.1Dan Finlay2016-09-152-2/+4
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * / Version 2.12.12.12.1Dan Finlay2016-09-152-2/+4
| |/ /
| * | Merge pull request #666 from MetaMask/i#626kumavis2016-09-153-17/+15
| |\ \
| | * | Do not show user rejection errors within our UI.Dan Finlay2016-09-151-1/+3
| | * | Merge branch 'master' into i#626Frankie2016-09-152-2/+5
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #665 from MetaMask/Version-2.12.0Dan Finlay2016-09-152-2/+5
| |\ \ \ | | |_|/ | |/| |
| | * | Version 2.12.02.12.0Dan Finlay2016-09-151-1/+1
| | * | Version 2.11.2Dan Finlay2016-09-152-2/+5
| |/ /
| | * Remove unused argumentFrankie2016-09-151-1/+1
| | * Fix popup flag assignmentDan Finlay2016-09-151-2/+1
| | * Merge branch 'master' into i#626Frankie2016-09-151-1/+1
| | |\ | | |/ | |/|
| * | Merge pull request #663 from MetaMask/pe805Dan Finlay2016-09-151-1/+1
| |\ \
| | * | deps - bump provider-engine 8.0.5kumavis2016-09-151-1/+1
| |/ /
| | * Add to CHANGELOG.mdFrankie2016-09-151-0/+3
| | * Dont generate a popup notification when submiting a transaction from with in ...Frankie2016-09-151-17/+11
| |/
* / Modify user agreementKevin Serrano2016-09-151-28/+148
|/
* Merge pull request #657 from MetaMask/librarykumavis2016-09-143-51/+144
|\
| * Merge branch 'master' into librarykumavis2016-09-149-48/+59
| |\ | |/ |/|
* | Merge pull request #656 from MetaMask/i646-ClosePopupBugKevin Serrano2016-09-142-3/+12
|\ \
| * \ Merge branch 'i646-ClosePopupBug' of github.com:MetaMask/metamask-plugin into...Dan Finlay2016-09-148-45/+47
| |\ \
| | * \ Merge branch 'master' into i646-ClosePopupBugDan Finlay2016-09-148-45/+47
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #648 from MetaMask/qrCodeDan Finlay2016-09-148-45/+47
|\ \ \ \
| * \ \ \ Merge branch 'master' into qrCodeFrankie2016-09-1422-118/+472
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | Remove unused code in qr actionsFrankie2016-09-131-2/+0
| * | | | Merge branch 'master' into qrCodeFrankie2016-09-1311-92/+173
| |\ \ \ \
| * | | | | Add to CHANGELOG.mdFrankie2016-09-131-0/+1
| * | | | | Add qrcode-npm to package.json and swap out Qr Code generator api for node-mo...Frankie2016-09-137-45/+48
| | | | * | Merge branch 'master' into i646-ClosePopupBugDan Finlay2016-09-140-0/+0
| | | | |\ \ | |_|_|_|/ / |/| | | | |
| | | * | | Bump changelogDan Finlay2016-09-141-0/+3
| | | |/ /
| | | * | Merge pull request #655 from MetaMask/FixPortStreamEndkumavis2016-09-142-5/+10
| | | |\ \
| | | | | * mascara - run background in iframekumavis2016-09-143-51/+144
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #655 from MetaMask/FixPortStreamEndkumavis2016-09-141-2/+1
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | Fix port stream end bugDan Finlay2016-09-141-2/+1
|/ / /
* | | Merge pull request #651 from MetaMask/librarykumavis2016-09-1418-114/+465
|\ \ \
| * | | mascara - serve popup bundlekumavis2016-09-141-10/+22
| * | | PendingTxDetails - partially remove imagify supportkumavis2016-09-141-26/+11
| * | | Merge branch 'library' of github.com:MetaMask/metamask-plugin into librarykumavis2016-09-1311-92/+177
| |\ \ \
| | * \ \ Merge branch 'master' into librarykumavis2016-09-1311-92/+177
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | Merge pull request #650 from MetaMask/FixCacheBustBug2.11.1Dan Finlay2016-09-133-2/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix cache clearing reference for OperaDan Finlay2016-09-133-2/+6
|/ / / /
* | | | Merge pull request #647 from MetaMask/Version-2.11.02.11.0Dan Finlay2016-09-132-1/+3
|\ \ \ \
| * | | | Version 2.11.0Dan Finlay2016-09-132-1/+3
|/ / / /
* | | | Merge pull request #645 from MetaMask/FixPasswordingKevin Serrano2016-09-139-91/+170
|\ \ \ \ | |_|_|/ |/| | |
| * | | Make cache clearning error tolerantDan Finlay2016-09-131-1/+6
| * | | Fix clearing of account cache on vault restoreDan Finlay2016-09-132-11/+13
| * | | Ensure loading indication covers foxDan Finlay2016-09-131-0/+1
| * | | LintedDan Finlay2016-09-131-2/+2
| * | | Load accounts into ethStore on unlockDan Finlay2016-09-131-0/+1
| * | | Fix single account list formattingDan Finlay2016-09-132-5/+2
| * | | Add accounts back to metamask stateDan Finlay2016-09-135-15/+19
| * | | Merge branch 'master' into FixPasswordingDan Finlay2016-09-136-16/+18
| |\ \ \ | |/ / / |/| | |
| * | | Fix keystore referenceDan Finlay2016-09-131-0/+1
| * | | Fix some referencesDan Finlay2016-09-132-4/+4
| * | | Fix account unlockingDan Finlay2016-09-133-29/+33
| | * | mascara - add readmekumavis2016-09-132-5/+6
| | * | mascara - everything but the popup bundlekumavis2016-09-134-4/+29
| | * | popup - breakout popup-corekumavis2016-09-132-61/+71
| | * | popup - further clean and commentkumavis2016-09-131-17/+13
| | * | ui - remove unused currentDomain propkumavis2016-09-135-23/+3
| | * | mascara - server - prepare to serve popupkumavis2016-09-131-1/+3
| | |/
| | * bugfix - prevent iframe restart restartkumavis2016-09-132-5/+9
| | * Merge branch 'master' of github.com:MetaMask/metamask-plugin into librarykumavis2016-09-1354-560/+1341
| | |\ | |_|/ |/| |
* | | Merge pull request #644 from MetaMask/revert-638-i555-SaltVaultFrankie2016-09-138-151/+89
|\ \ \ | |/ / |/| |
| * | Revert "Add new eth-lightwallet salting to vault."Frankie2016-09-138-151/+89
|/ /
* | Merge pull request #638 from MetaMask/i555-SaltVaultFrankie2016-09-138-89/+151
|\ \
| * \ Merge branch 'master' into i555-SaltVaultDan Finlay2016-09-131-0/+7
| |\ \ | |/ / |/| |
* | | Merge pull request #639 from MetaMask/DevFaqKevin Serrano2016-09-131-0/+7
|\ \ \
| * | | Add developer faq to top of readmeDan Finlay2016-09-101-0/+7
|/ / /
| * | Select first address when restoring vaultDan Finlay2016-09-122-2/+28
| * | Fix ethStore pushed addressesDan Finlay2016-09-121-1/+1
| * | Fix account list formatting when only a single item.Dan Finlay2016-09-122-10/+7
| * | Fixed caching bugDan Finlay2016-09-112-12/+6
| * | Correct assertion for BIP32 complianceDan Finlay2016-09-111-1/+1
| * | Remove logDan Finlay2016-09-111-1/+0
| * | Add more bip44 assertionsDan Finlay2016-09-111-1/+9
| * | Made bip44 assertions easier to add toDan Finlay2016-09-111-27/+36
| * | Clean up testsDan Finlay2016-09-111-18/+17
| * | Correctly clear ethStore cache on new vault restoreDan Finlay2016-09-112-13/+38
| * | Captured #640 in failing testDan Finlay2016-09-112-1/+17
| * | Camelcase dataset key for reactDan Finlay2016-09-113-8/+8
| * | Bump changelogDan Finlay2016-09-101-0/+1
| * | Add new eth-lightwallet salting to vault.Dan Finlay2016-09-102-58/+46
|/ /
* | Merge pull request #636 from MetaMask/how-it-works-bugKevin Serrano2016-09-102-3/+5
|\ \
| * | Update changelogKevin Serrano2016-09-101-1/+1
| * | Do not trigger how-to-video on anything but install.Kevin Serrano2016-09-101-2/+4
|/ /
* | Merge pull request #630 from MetaMask/i610-InitOneWalletOnlyKevin Serrano2016-09-102-1/+2
|\ \
| * | Merge branch 'i610-InitOneWalletOnly' of github.com:MetaMask/metamask-plugin ...Kevin Serrano2016-09-102-1/+2
|/| |
| * | Bump changelogDan Finlay2016-09-091-0/+1
| * | Only init one wallet on restoreDan Finlay2016-09-091-1/+1
* | | Merge pull request #632 from MetaMask/FixLogoPasswordFollowKevin Serrano2016-09-102-3/+2
|\ \ \
| * \ \ Merge branch 'master' into FixLogoPasswordFollowKevin Serrano2016-09-102-0/+3
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #631 from MetaMask/i599-LoginLoadingIndicationKevin Serrano2016-09-102-0/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Show loading indication during unlocking.Dan Finlay2016-09-092-0/+3
|/ / /
| * / Fix fox logo password followingDan Finlay2016-09-092-3/+2
|/ /
* | Merge pull request #629 from MetaMask/FixLogoLeakFrankie2016-09-093-5/+8
|\ \
| * \ Merge branch 'master' into FixLogoLeakDan Finlay2016-09-097-9/+17
| |\ \ | |/ / |/| |
* | | Merge pull request #627 from MetaMask/i#589pendingTxsIssueDan Finlay2016-09-097-9/+17
|\ \ \
| * \ \ Merge branch 'i#589pendingTxsIssue' of https://github.com/MetaMask/metamask-p...Frankie2016-09-097-177/+29
| |\ \ \
| | * \ \ Merge branch 'master' into i#589pendingTxsIssueFrankie2016-09-097-177/+29
| | |\ \ \ | |_|/ / / |/| | | |
| * | | | Fix wording in changelog and bugFrankie2016-09-092-2/+2
| |/ / /
| * | | Remove console.logFrankie2016-09-091-1/+0
| * | | Add to CHANGELOG.md and Remove unnecessary catchFrankie2016-09-092-9/+1
| * | | Merge branch 'master' into i#589pendingTxsIssueFrankie2016-09-0915-178/+206
| |\ \ \
| * | | | Add network checks for unconfirmed TxsFrankie2016-09-095-8/+25
| * | | | Filter out pending txs based on network from tx historyFrankie2016-09-081-1/+1
| | | * | Fix new logo related errorsDan Finlay2016-09-093-5/+8
| |_|/ / |/| | |
* | | | Merge pull request #625 from MetaMask/AddNewLogoKevin Serrano2016-09-097-177/+29
|\ \ \ \ | |_|/ / |/| | |
| * | | Bump changelogDan Finlay2016-09-091-0/+1
| * | | Merge branch 'master' into AddNewLogoDan Finlay2016-09-0912-175/+111
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #615 from MetaMask/ModularFiatBalanceKevin Serrano2016-09-0914-177/+205
|\ \ \ \
| * | | | Restore broken variable referenceDan Finlay2016-09-091-0/+1
| * | | | Merge branch 'ModularFiatBalance' of github.com:MetaMask/metamask-plugin into...Dan Finlay2016-09-092-2/+1
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into ModularFiatBalanceDan Finlay2016-09-092-2/+1
| | |\ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix double tooltipDan Finlay2016-09-091-10/+1
| |/ / / /
| * | | | Merge branch 'master' into ModularFiatBalanceDan Finlay2016-09-076-8/+16
| |\ \ \ \
| * | | | | Bump changelogDan Finlay2016-09-071-0/+2
| * | | | | LintedDan Finlay2016-09-071-23/+22
| * | | | | Add fiat balances to tx conf viewDan Finlay2016-09-072-9/+7
| * | | | | Add fiat conversion to pending tx development stateDan Finlay2016-09-072-2/+94
| * | | | | Got basic fiat display modularizedDan Finlay2016-09-073-22/+26
| * | | | | Fix fiat-valueDan Finlay2016-09-071-1/+0
| * | | | | Nearly finished factoring fiat value into eth-balanceDan Finlay2016-09-079-109/+19
| * | | | | Merge branch 'master' into ModularFiatBalanceDan Finlay2016-09-078-28/+187
| |\ \ \ \ \
| * | | | | | Continuing fiat balance modularizationDan Finlay2016-09-043-73/+106
| | | | * | | Remove npm i again because apparently that workedDan Finlay2016-09-091-1/+0
| | | | * | | Remove deps added for older ubuntuDan Finlay2016-09-091-6/+1
| | | | * | | Remove npm i to check if cache heldDan Finlay2016-09-091-1/+0
| | | | * | | Try adding npm i to circle.ymlDan Finlay2016-09-091-0/+1
| | | | * | | Fix logo usage for metamask-logo v2.0.0Dan Finlay2016-09-092-15/+4
| | | | * | | Update locked stateDan Finlay2016-09-092-63/+23
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #619 from johnweldon/masterDan Finlay2016-09-081-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix typoJohn Weldon2016-09-081-1/+1
|/ / / / /
* | | | | Merge pull request #618 from MetaMask/RollbackLeakFixKevin Serrano2016-09-071-1/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Reverting memory leak fixDan Finlay2016-09-071-1/+0
|/ / / /
* | | | Merge pull request #617 from MetaMask/i616-FixListenerLeakKevin Serrano2016-09-073-1/+3
|\ \ \ \
| * | | | Bump changelogDan Finlay2016-09-072-25/+1
| * | | | Ensure listener is cleaned upDan Finlay2016-09-073-1/+27
|/ / / /
* | | | Merge pull request #612 from MetaMask/first-timeDan Finlay2016-09-075-7/+14
|\ \ \ \ | |_|/ / |/| | |
| * | | Update changelog and merge master.Kevin Serrano2016-09-071-0/+1
| * | | Merge branch 'master' into first-timeKevin Serrano2016-09-072-0/+107
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #614 from MetaMask/i546-NegativeErrKevin Serrano2016-09-072-0/+107
|\ \ \ \
| * | | | Add negative value validation to tx approvalDan Finlay2016-09-072-0/+107
|/ / / /
| * | | Fix capitalization.Kevin Serrano2016-09-071-1/+1
| * | | Replace chrome with generalized browser API.Kevin Serrano2016-09-071-2/+2
| * | | Add to changelog.Kevin Serrano2016-09-071-0/+2
| * | | Redirect to video in a new tab on fresh install.Kevin Serrano2016-09-071-1/+6
| * | | Fix typos and refine wording.Kevin Serrano2016-09-072-5/+4
|/ / /
* | | Merge pull request #611 from vincentserpoul/patch-1Kevin Serrano2016-09-061-2/+3
|\ \ \
| * | | lintingVincent Serpoul2016-09-061-1/+1
| * | | Error message more helpfulVincent Serpoul2016-09-061-2/+3
|/ / /
* | | Merge pull request #609 from MetaMask/livereloadkumavis2016-09-043-7/+45
|\ \ \
| * | | Fix boolean.Kevin Serrano2016-09-031-1/+1
| * | | Merge branch 'master' into livereloadKevin Serrano2016-09-032-1/+5
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #608 from MetaMask/2.10.2Kevin Serrano2016-09-032-1/+5
|\ \ \ \
| * | | | Version 2.10.2kumavis2016-09-032-1/+5
|/ / / /
| * | | Merge branch 'master' into livereloadKevin Serrano2016-09-033-19/+28
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #607 from MetaMask/notif-fix2.10.2Kevin Serrano2016-09-031-18/+24
|\ \ \ \
| * \ \ \ Merge branch 'master' into notif-fixKevin Serrano2016-09-030-0/+0
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #606 from MetaMask/2.10.12.10.1kumavis2016-09-032-1/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| | * | | notif - use standard err-first callback stylekumavis2016-09-031-18/+24
| |/ / /
| * / / Version 2.10.1kumavis2016-09-032-1/+4
|/ / /
| * | Changelog add.Kevin Serrano2016-09-031-1/+1
| * | Changelog add and rename vars.Kevin Serrano2016-09-032-6/+7
| * | Refactor for spreading. Add conditionals for livereload.Kevin Serrano2016-09-031-6/+24
| * | Add production flag. Conditionally copy reload based on production.Kevin Serrano2016-09-021-1/+16
| * | Install deps. Fix chrome/firefox typo.Kevin Serrano2016-09-022-3/+7
|/ /
* | Merge pull request #603 from MetaMask/i566-NoPopupWhenOpenKevin Serrano2016-09-024-14/+21
|\ \
| * \ Merge branch 'master' into i566-NoPopupWhenOpenDan Finlay2016-09-021-4/+18
| |\ \ | |/ / |/| |
* | | Merge pull request #601 from MetaMask/filterfixDan Finlay2016-09-011-4/+18
|\ \ \
| * | | inpage - remap ids on responsekumavis2016-09-011-4/+18
|/ / /
| * | Bump changelogDan Finlay2016-09-021-0/+1
| * | LintedDan Finlay2016-09-021-1/+1
| * | Show conf screen after send requestDan Finlay2016-09-021-2/+1
| * | Skip loading indication from send screenDan Finlay2016-09-021-1/+0
| * | Do not open popup for internally produced txsDan Finlay2016-09-021-11/+19
|/ /
* | Merge pull request #600 from MetaMask/i597-ModifyInfuraUrlsDan Finlay2016-09-011-2/+2
|\ \
| * | Add metamask route to infura urlsDan Finlay2016-09-011-2/+2
|/ /
* | Merge pull request #596 from MetaMask/EdgeCompatibilitykumavis2016-08-309-28/+76
|\ \
| * | Make element enumeration Edge compatibleDan Finlay2016-08-301-10/+7
| * | Add test for Edge compatibilityDan Finlay2016-08-301-0/+29
| * | Remove old notification cleanup codeDan Finlay2016-08-301-10/+0
| * | Make popup a type Edge supportsDan Finlay2016-08-301-1/+2
| * | Add extra edge compatibilityDan Finlay2016-08-301-2/+13
| * | Fix console.error referencesDan Finlay2016-08-301-3/+3
| * | Remove bind calls from console errorsDan Finlay2016-08-301-4/+4
| * | Add tolerance for failed form persistingDan Finlay2016-08-301-0/+7
| * | Merge branch 'master' into EdgeCompatibilityDan Finlay2016-08-3076-491/+3768
| |\ \ | |/ / |/| |
* | | Merge pull request #594 from MetaMask/i541-CustomMenuItemFixkumavis2016-08-304-8/+13
|\ \ \
| * | | Bump changelogDan Finlay2016-08-301-0/+2
| * | | Show custom rpc menu item alwaysDan Finlay2016-08-301-6/+9
| * | | Make custom network dev state not loadingDan Finlay2016-08-302-2/+2
|/ / /
* | | Merge pull request #593 from MetaMask/Version-2.10.02.10.0Dan Finlay2016-08-302-4/+5
|\ \ \
| * | | Version 2.10.0Dan Finlay2016-08-302-4/+5
|/ / /
* | | Merge pull request #591 from MetaMask/SpellingFixDan Finlay2016-08-271-1/+1
|\ \ \
| * | | Fix spelling errorDan Finlay2016-08-271-1/+1
|/ / /
* | | Merge pull request #588 from MetaMask/i#563forgotPasswordDan Finlay2016-08-278-44/+177
|\ \ \
| * | | make the back button its own functionFrankie2016-08-271-21/+22
| * | | Merge branch 'master' into i#563forgotPasswordFrankie2016-08-2620-196/+699
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #554 from MetaMask/PopupNotificationskumavis2016-08-2611-183/+108
|\ \ \ \
| * \ \ \ Merge branch 'master' into PopupNotificationsDan Finlay2016-08-2613-18/+607
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #590 from MetaMask/i432PersistFormStatekumavis2016-08-2610-13/+591
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into i432PersistFormStateDan Finlay2016-08-262-1/+7
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Bump changelogDan Finlay2016-08-261-1/+2
| * | | | | LintedDan Finlay2016-08-261-3/+1
| * | | | | Persist shapeshift form input valuesDan Finlay2016-08-261-3/+12
| * | | | | Add shapeshift development stateDan Finlay2016-08-262-1/+349
| * | | | | Persist send tx form field valuesDan Finlay2016-08-261-5/+14
| * | | | | Remove logDan Finlay2016-08-261-1/+0
| * | | | | Add send form development stateDan Finlay2016-08-262-1/+77
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 21:58:14 +0800