aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:MetaMask/metamask-plugin into Version-2.13.3kumavis2016-10-058-4/+21
|\
| * Merge pull request #696 from MetaMask/SmallerCopiedButtonkumavis2016-10-053-1/+5
| |\ | | | | | | Formatting Fixes
| | * Merge branch 'master' into SmallerCopiedButtonkumavis2016-10-055-3/+17
| | |\ | | |/ | |/|
| * | Merge pull request #694 from MetaMask/AddAnnouncerScriptkumavis2016-10-052-1/+14
| |\ \ | | | | | | | | Add announcer script
| | * \ Merge branch 'master' into AddAnnouncerScriptkumavis2016-10-055-5/+10
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #700 from MetaMask/OperaCompatibilitykumavis2016-10-053-2/+3
| |\ \ \ | | | | | | | | | | Add Opera compatibility
| | * \ \ Merge branch 'master' into OperaCompatibilityDan Finlay2016-10-052-3/+7
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Add Opera compatibilityDan Finlay2016-10-053-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | - Fix incorrect OS key - Add additional icon image sizes.
| | | * | Add announcer scriptDan Finlay2016-10-052-1/+14
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I always keep writing up this same announcement message whenever I publish a new version. I've now written a script to automate my announcement formatting, it looks like this: ``` **MetaMask 2.13.2** now published to the Chrome Store! It should be available over the next hour! 2016-10-4 - Fix bug where chosen FIAT exchange rate does no persist when switching networks - Fix additional parameters that made MetaMask sometimes receive errors from Parity. - Fix bug where invalid transactions would still open the MetaMask popup. ```
| | | * Merge branch 'master' into SmallerCopiedButtonFrankie2016-10-052-3/+7
| | | |\ | | |_|/ | |/| |
| | | * Bump changelogDan Finlay2016-10-051-0/+1
| | | |
| | | * Make popup a little tallerDan Finlay2016-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | For some reason the popup was often cutting off the bottom buttons of the UI. We should look at that more carefully later perhaps, but especially since we're considering moving off the popup, I'm just fixing it by making it taller for now.
| | | * Make seed word confirmation button font smallerDan Finlay2016-10-052-0/+3
| | |/ | | | | | | | | | To avoid formatting glitches on some machines.
* | / Version 2.13.3Dan Finlay2016-10-053-2/+6
|/ / | | | | | | Bumps provider-engine to fix log query filtering bug.
* | Merge pull request #697 from MetaMask/StripPrivateKeyPrefixFrankie2016-10-052-3/+7
|\ \ | |/ |/| Removed hex prefix from private key export
| * Removed hex prefix from private key exportDan Finlay2016-10-052-3/+7
|/ | | | | | For compatibility with Jaxx, MEW, and Geth. Fixes #687
* Merge pull request #693 from MetaMask/Version-2.13.22.13.2Dan Finlay2016-10-053-2/+5
|\ | | | | Version 2.13.2
| * Version 2.13.2Dan Finlay2016-10-053-2/+5
|/
* Merge pull request #692 from MetaMask/ParityFixKevin Serrano2016-10-042-17/+6
|\ | | | | Improve popup behavior for tx errors
| * Improve popup behavior for parity errorsDan Finlay2016-10-042-17/+6
|/ | | | When we receive an invalid params error, instead of opening the popup and showing no tx, we now just forward that tx back to the UI code.
* Merge pull request #689 from MetaMask/i#688Dan Finlay2016-10-022-1/+4
|\ | | | | Fix for where fiat conversion does not persist when switching networks
| * 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.1
| * Version 2.13.12.13.1Dan Finlay2016-09-233-3/+7
|/
* Merge pull request #677 from MetaMask/i675-LoadingBuyDan Finlay2016-09-226-17/+18
|\ | | | | Show loading indication when selecting ShapeShift
| * Merge branch 'master' into i675-LoadingBuyDan Finlay2016-09-224-2/+10
| |\ | |/ |/|
* | Merge pull request #678 from MetaMask/ParityComplianceDan Finlay2016-09-224-2/+10
|\ \ | | | | | | Parity compliance
| * | 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
| |\ | |/ |/|
* | Merge pull request #676 from MetaMask/tx-vizDan Finlay2016-09-162-4/+18
|\ \ | | | | | | Add eth-tx-viz link to tx history
| * | 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
| |\ \ | |/ / |/| |
| * | Add to CHANGELOG.mdFrankie2016-09-161-0/+3
| | |
| * | add tx-viz link to transaction historyFrankie2016-09-161-12/+27
| | |
| | * Show loading indication when selecting ShapeShiftDan Finlay2016-09-164-11/+14
| |/ |/|
* | Merge pull request #673 from MetaMask/i#519buyButtonTxConfDan Finlay2016-09-1611-20/+88
|\ \ | |/ |/| Drop the buy button in if tx is more then account balance
| * 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
| |\ | |/ |/|
* | Merge pull request #671 from MetaMask/UpdateGlobalRefsDan Finlay2016-09-151-8/+8
|\ \ | | | | | | Update global refs
| * | 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-152-2/+4
|\ \ \ | | | | | | | | Version 2.12.1
| | * | Merge pull request #669 from MetaMask/Version-2.12.1Dan Finlay2016-09-153-10/+14
| |/| | |/|/ / | | | | | | Version 2.12.1
| * / Version 2.12.12.12.1Dan Finlay2016-09-152-2/+4
|/ /
* | Merge pull request #666 from MetaMask/i#626kumavis2016-09-153-17/+15
|\ \ | | | | | | Dont generate a popup notification for transactions from within metmask-extension
| * | 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.0
| * | | 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
| |\ \ | |/ / |/| |
| * | 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
| | | | | | | | | | | | MetaMask
| | * 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
| |/ |/|
* | Merge pull request #663 from MetaMask/pe805Dan Finlay2016-09-151-1/+1
|\ \ | |/ |/| deps - bump provider-engine 8.0.5
| * deps - bump provider-engine 8.0.5kumavis2016-09-151-1/+1
|/
* Merge pull request #657 from MetaMask/librarykumavis2016-09-143-51/+144
|\ | | | | mascara - popup initially working
| * Merge branch 'master' into librarykumavis2016-09-149-48/+59
| |\ | |/ |/|
* | Merge pull request #656 from MetaMask/i646-ClosePopupBugKevin Serrano2016-09-142-3/+12
|\ \ | | | | | | Fix popup closing bug
| * \ Merge branch 'i646-ClosePopupBug' of github.com:MetaMask/metamask-plugin ↵Dan Finlay2016-09-148-45/+47
| |\ \ | | | | | | | | | | | | into i646-ClosePopupBug
| | * \ Merge branch 'master' into i646-ClosePopupBugDan Finlay2016-09-148-45/+47
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #648 from MetaMask/qrCodeDan Finlay2016-09-148-45/+47
|\ \ \ \ | | | | | | | | | | Put qr button back in account detail screen...
| * \ \ \ 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 ↵Frankie2016-09-137-45/+48
| | | | | | | | | | | | | | | | | | | | | | | | node-module
| | | | * | 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
| | | |\ \ | | | | | | | | | | | | | | | | | | Fix port stream end bug
| | | | | * mascara - run background in iframekumavis2016-09-143-51/+144
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #655 from MetaMask/FixPortStreamEndkumavis2016-09-141-2/+1
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | Fix port stream end bug
| * | | Fix port stream end bugDan Finlay2016-09-141-2/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | Emitting `end` or `close` was not ending the stream. Pushing a null packet also closes a stream, so I did that instead. Fixes #616
* | | Merge pull request #651 from MetaMask/librarykumavis2016-09-1418-114/+465
|\ \ \ | | | | | | | | MetaMask "Mascara" Library - initial PR
| * | | 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 Opera
| * | | | Fix cache clearing reference for OperaDan Finlay2016-09-133-2/+6
|/ / / / | | | | | | | | | | | | For some reason Chrome didn't mind this awful bug, but Opera caught it.
* | | | Merge pull request #647 from MetaMask/Version-2.11.02.11.0Dan Finlay2016-09-132-1/+3
|\ \ \ \ | | | | | | | | | | Version 2.11.0
| * | | | Version 2.11.0Dan Finlay2016-09-132-1/+3
|/ / / /
* | | | Merge pull request #645 from MetaMask/FixPasswordingKevin Serrano2016-09-139-91/+170
|\ \ \ \ | |_|_|/ |/| | | Fix account unlocking
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SubmitPassword was not creating a new id-management This is because I broke up the old "createIdmgmt" method to not perform as much conditional logic. Now the pieces are reusable and do what they should do.
| | * | 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."
| * | 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
|\ \ | | | | | | Add new eth-lightwallet salting to vault.
| * \ 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 readme
| * | | Add developer faq to top of readmeDan Finlay2016-09-101-0/+7
|/ / /
| * | Select first address when restoring vaultDan Finlay2016-09-122-2/+28
| | | | | | | | | | | | Fixes #642
| * | Fix ethStore pushed addressesDan Finlay2016-09-121-1/+1
| | | | | | | | | | | | Needed to add hex prefix always.
| * | Fix account list formatting when only a single item.Dan Finlay2016-09-122-10/+7
| | | | | | | | | | | | | | | | | | - Makes account list items no longer flex larger than they should be. - Makes the add account button not flex larger than it should be. - Adds a line under the add account button to define its size.
| * | Fixed caching bugDan Finlay2016-09-112-12/+6
| | | | | | | | | | | | | | | | | | Fixed bug where the second new vault created in an IdStore would initially return the accounts from the original store. Also fixed some tests that were incorrect.
| * | Correct assertion for BIP32 complianceDan Finlay2016-09-111-1/+1
| | | | | | | | | | | | According to [axic's work here](https://github.com/MetaMask/metamask-plugin/issues/640#issuecomment-246133672), MetaMask is generating the correct address, so I've corrected that assertion accordingly.
| * | 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
|/ / | | | | | | | | | | | | | | | | | | eth-lightwallet was previously not salting vault passwords, potentially making it easier to crack them once obtained. This branch incorporates the API changes to allow us to take advantage of the new salting logic. This is still throwing deprecation warnings, but that's actually a bug in eth-lightwallet I wrote, [I've submitted a PR for that here](https://github.com/ConsenSys/eth-lightwallet/pull/116). Fixes #555
* | Merge pull request #636 from MetaMask/how-it-works-bugKevin Serrano2016-09-102-3/+5
|\ \ | | | | | | How it works now displays only on install
| * | 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
|\ \ | | | | | | Only init one wallet on restore
| * | Merge branch 'i610-InitOneWalletOnly' of github.com:MetaMask/metamask-plugin ↵Kevin Serrano2016-09-102-1/+2
|/| | | | | | | | | | | into i610-InitOneWalletOnly
| * | Bump changelogDan Finlay2016-09-091-0/+1
| | |
| * | Only init one wallet on restoreDan Finlay2016-09-091-1/+1
| | | | | | | | | | | | Fixes #610
* | | Merge pull request #632 from MetaMask/FixLogoPasswordFollowKevin Serrano2016-09-102-3/+2
|\ \ \ | | | | | | | | Fix fox logo password following
| * \ \ 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.
| * | | Show loading indication during unlocking.Dan Finlay2016-09-092-0/+3
|/ / /
| * / Fix fox logo password followingDan Finlay2016-09-092-3/+2
|/ / | | | | | | | | | | | | | | The new lightweight svg logo was not following text quite right. The new `lookAt` method was not using the same logic the module was using internally on mouse movement. I simply used that logic and exposed it via the old (expected) API, and got it behaving the way I like.
* | Merge pull request #629 from MetaMask/FixLogoLeakFrankie2016-09-093-5/+8
|\ \ | | | | | | Fix new logo related errors
| * \ Merge branch 'master' into FixLogoLeakDan Finlay2016-09-097-9/+17
| |\ \ | |/ / |/| |
* | | Merge pull request #627 from MetaMask/i#589pendingTxsIssueDan Finlay2016-09-097-9/+17
|\ \ \ | | | | | | | | I#589pending txs issue
| * \ \ Merge branch 'i#589pendingTxsIssue' of ↵Frankie2016-09-097-177/+29
| |\ \ \ | | | | | | | | | | | | | | | https://github.com/MetaMask/metamask-plugin into i#589pendingTxsIssue
| | * \ \ 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
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed logo deallocation related bugs, had to patch the logo repo itself to add a stopAnimating method. Also tuned up the logo to more closely resemble the old behavior. - Overlaps the title text - Points nose at cursor, not just front of eyes - Cursor is more "distant" from fox, to avoid extreme angles on edges.
* | | | Merge pull request #625 from MetaMask/AddNewLogoKevin Serrano2016-09-097-177/+29
|\ \ \ \ | |_|/ / |/| | | Add new lightweight logo
| * | | 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
|\ \ \ \ | | | | | | | | | | Add fiat conversion to tx confirmation view
| * | | | Restore broken variable referenceDan Finlay2016-09-091-0/+1
| | | | |
| * | | | Merge branch 'ModularFiatBalance' of github.com:MetaMask/metamask-plugin ↵Dan Finlay2016-09-092-2/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into ModularFiatBalance
| | * \ \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - No longer need to check for webGL compliance (svg rendered!) - logo.canvas has been replaced with logo.container, since svg doesn't render to canvas but to an element. Otherwise, worked with very little effort!! Fixes #624
| | | | * | | Update locked stateDan Finlay2016-09-092-63/+23
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #619 from johnweldon/masterDan Finlay2016-09-081-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Fix minor typo
| * | | | | Fix typoJohn Weldon2016-09-081-1/+1
|/ / / / /
* | | | | Merge pull request #618 from MetaMask/RollbackLeakFixKevin Serrano2016-09-071-1/+0
|\ \ \ \ \ | |_|_|/ / |/| | | | Reverting memory leak fix
| * | | | Reverting memory leak fixDan Finlay2016-09-071-1/+0
|/ / / / | | | | | | | | | | | | | | | | | | | | This wasn't a good enough fix, and had other repercussions. Looking for a way to properly detect EOS, and tear down the correct stream accordingly.
* | | | Merge pull request #617 from MetaMask/i616-FixListenerLeakKevin Serrano2016-09-073-1/+3
|\ \ \ \ | | | | | | | | | | I616 fix listener leak
| * | | | Bump changelogDan Finlay2016-09-072-25/+1
| | | | |
| * | | | Ensure listener is cleaned upDan Finlay2016-09-073-1/+27
|/ / / / | | | | | | | | | | | | Also fixed bug when validating a tx with no value.
* | | | Merge pull request #612 from MetaMask/first-timeDan Finlay2016-09-075-7/+14
|\ \ \ \ | |_|/ / |/| | | Open Introduction Video tab on install
| * | | 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 approval
| * | | | 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
|\ \ \ | | | | | | | | Error message more helpful
| * | | 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
|\ \ \ | | | | | | | | Add ability to disable livereload
| * | | 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.2
| * | | | 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
|\ \ \ \ | | | | | | | | | | notif - use standard err-first callback style
| * \ \ \ 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
|\ \ \ \ \ | |_|_|/ / |/| | | | Version 2.10.1
| | * | | 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
|\ \ | | | | | | Don't show popup when sending tx from within metamask
| * \ 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 response
| * | | 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 urls
| * | Add metamask route to infura urlsDan Finlay2016-09-011-2/+2
|/ / | | | | | | | | | | Fixes #597 Allows metamask-specific RPC metrics.
* | Merge pull request #596 from MetaMask/EdgeCompatibilitykumavis2016-08-309-28/+76
|\ \ | | | | | | Edge compatibility
| * | 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
| | | | | | | | | | | | Microsoft edge does not support console.error.bind, nor is that call necessary here.
| * | 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
|\ \ \ | | | | | | | | Allow selecting custom rpc from menu even when custom rpc is selected
| * | | 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.0
| * | | Version 2.10.0Dan Finlay2016-08-302-4/+5
|/ / /
* | | Merge pull request #591 from MetaMask/SpellingFixDan Finlay2016-08-271-1/+1
|\ \ \ | | | | | | | | Fix spelling error
| * | | Fix spelling errorDan Finlay2016-08-271-1/+1
|/ / /
* | | Merge pull request #588 from MetaMask/i#563forgotPasswordDan Finlay2016-08-278-44/+177
|\ \ \ | | | | | | | | Add a back button for Lock screen
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 02:09:32 +0800