aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Noted initial thoughtsDan Finlay2016-08-261-0/+14
|
* Merge pull request #584 from MetaMask/shortcut-fixKevin Serrano2016-08-252-5/+10
|\ | | | | Fixed prohibited shortcut combination.
| * Bump versioning.Kevin Serrano2016-08-252-1/+6
| |
| * Merge branch 'master' into shortcut-fixKevin Serrano2016-08-252-1/+3
| |\ | |/ |/|
* | Merge pull request #583 from MetaMask/Version-2.9.1Dan Finlay2016-08-252-1/+3
|\ \ | | | | | | Version 2.9.1
| * | Version 2.9.1Dan Finlay2016-08-252-1/+3
|/ /
| * Fixed prohibited shortcut combination.Kevin Serrano2016-08-251-4/+4
|/
* Merge pull request #581 from MetaMask/i484PersistPendingSignaturesKevin Serrano2016-08-252-0/+2
|\ | | | | Fix bug where unconfirmed message sig is lost when locked.
| * Merge branch 'master' into i484PersistPendingSignaturesDan Finlay2016-08-259-11/+439
| |\ | |/ |/|
* | Merge pull request #579 from MetaMask/api-test-fixDan Finlay2016-08-254-3/+16
|\ \ | | | | | | Api test fix
| * \ Merge branch 'master' into api-test-fixKevin Serrano2016-08-255-8/+412
| |\ \ | |/ / |/| |
* | | Merge pull request #580 from MetaMask/FixEmptySignBugKevin Serrano2016-08-255-8/+412
|\ \ \ | | | | | | | | Fix empty sign bug
| * | | LintedDan Finlay2016-08-251-1/+0
| | | |
| * | | Bump changelogDan Finlay2016-08-251-0/+1
| | | |
| * | | Improve msg signing paddingDan Finlay2016-08-251-5/+3
| | | |
| * | | Fix empty sign message bugDan Finlay2016-08-251-1/+1
| | | |
| * | | Add pending sign msg development stateDan Finlay2016-08-252-1/+407
|/ / /
| * | Naming issue.Kevin Serrano2016-08-251-1/+1
| | |
| * | Implement usage of nock.Kevin Serrano2016-08-253-24/+24
| | |
| * | Changelog change.Kevin Serrano2016-08-251-0/+1
| | |
| * | Now calls API functions with mock options.Kevin Serrano2016-08-251-3/+5
| | |
| * | Added mock option to function.Kevin Serrano2016-08-251-13/+23
|/ /
* | Merge pull request #575 from MetaMask/shortcutsKevin Serrano2016-08-252-0/+11
|\ \ | | | | | | Shortcut to open MetaMask
| * | Clarify shortcut.Kevin Serrano2016-08-251-1/+1
| | |
| * | Change shortcut again to Ctrl+Alt+MKevin Serrano2016-08-252-5/+5
| | |
| * | Change shortcut to Alt+MKevin Serrano2016-08-252-5/+5
| | |
| * | Update changelog.Kevin Serrano2016-08-241-0/+1
| | |
| * | Add shortcut for opening MetaMask.Kevin Serrano2016-08-241-0/+10
|/ /
| * Bump changelogDan Finlay2016-08-251-0/+1
| |
| * LintedDan Finlay2016-08-251-1/+1
| |
| * Fix bug where unconfirmed message sig is lost when locked.Dan Finlay2016-08-251-0/+1
|/ | | | | | Fixes #484 Adds unsigned messages to the in-memory message list before showing the unlock message.
* Merge pull request #574 from MetaMask/fox-subDan Finlay2016-08-245-9/+17
|\ | | | | Sub static fox image when WebGL isn't supported
| * Remove gulp dependency.Kevin Serrano2016-08-241-1/+0
| |
| * Modify package.json.Kevin Serrano2016-08-241-1/+1
| |
| * Merge branch 'master' into fox-subKevin Serrano2016-08-2417-18/+186
| |\ | |/ |/|
* | Merge pull request #573 from MetaMask/kumavis-patch-1kumavis2016-08-231-1/+1
|\ \ | | | | | | inpage - cleanContextForImports fix
| * \ Merge branch 'master' into kumavis-patch-1kumavis2016-08-2312-15/+128
| |\ \ | |/ / |/| |
* | | Merge pull request #558 from MetaMask/i390-TransactionLimitkumavis2016-08-2312-15/+128
|\ \ \ | | | | | | | | Enforce transaction log limit
| * \ \ Merge branch 'master' into i390-TransactionLimitkumavis2016-08-234-2/+58
| |\ \ \ | |/ / / |/| | |
| * | | Add gulp tasks as npm scriptsDan Finlay2016-08-231-0/+3
| | | |
| * | | More lintingDan Finlay2016-08-232-4/+1
| | | |
| * | | LintedDan Finlay2016-08-234-8/+4
| | | |
| * | | Removed view more button, added account info button.Dan Finlay2016-08-236-24/+70
| | | | | | | | | | | | | | | | | | | | | | | | Also: - Also fixed bug that caused React warning when rendering the tx history. - Renamed 'Transactions' to 'History', since it now has more than that.
| * | | Add builds.zip to gitignoreDan Finlay2016-08-231-0/+1
| | | |
| * | | Merge branch 'master' into i390-TransactionLimitDan Finlay2016-08-2321-24/+532
| |\ \ \
| * \ \ \ Merge branch 'master' into i390-TransactionLimitDan Finlay2016-08-193-13/+20
| |\ \ \ \
| * | | | | Change 'View More' to 'Show More'Dan Finlay2016-08-191-1/+1
| | | | | |
| * | | | | LintedDan Finlay2016-08-191-1/+1
| | | | | |
| * | | | | Added `view more` button to transaction listDan Finlay2016-08-195-7/+59
| | | | | | | | | | | | | | | | | | | | | | | | Visible at the end of the transaction list, or if no transactions are listed, displayed right after the `No Transactions` message.
| * | | | | Enforce tx history limitDan Finlay2016-08-192-0/+17
| | | | | |
| | | | * | inpage - cleanContextForImports fixkumavis2016-08-231-1/+1
| |_|_|/ / |/| | | | | | | | | | | | | | set to undefined instead of deleting updates #447
* | | | | Merge pull request #572 from MetaMask/i479kumavis2016-08-231-2/+28
|\ \ \ \ \ | | | | | | | | | | | | inpage provider - reassign incomming ids
| * \ \ \ \ Merge branch 'master' into i479kumavis2016-08-233-0/+30
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #571 from MetaMask/chinese-localDan Finlay2016-08-233-0/+30
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Chinese and Spanish localization
| * | | | | First part of chinese translation.Kevin Serrano2016-08-231-0/+10
| | | | | |
| * | | | | Add spanish locales.Kevin Serrano2016-08-232-0/+20
|/ / / / /
| * / / / inpage provider - reassign incomming idskumavis2016-08-231-2/+28
|/ / / /
| | | * Update package.jsonKevin Serrano2016-08-241-2/+3
| | | |
| | | * Changelog.Kevin Serrano2016-08-241-0/+2
| | | |
| | | * Linting.Kevin Serrano2016-08-241-2/+1
| | | |
| | | * Created option to pass in static file for fallback for logo.Kevin Serrano2016-08-242-3/+5
| | | |
| | | * Merge branch 'master' into fox-subKevin Serrano2016-08-236-9/+19
| | | |\ | |_|_|/ |/| | |
* | | | Merge pull request #568 from MetaMask/Version2.9.0Dan Finlay2016-08-232-1/+3
|\ \ \ \ | | | | | | | | | | Version 2.9.0
| * | | | Version 2.9.0Dan Finlay2016-08-232-1/+3
|/ / / /
* | | | Merge pull request #562 from MetaMask/ethBalanceDan Finlay2016-08-234-8/+16
|\ \ \ \ | | | | | | | | | | Fix issue where a given balance does not need to be parsed
| * | | | Add testFrankie2016-08-201-1/+6
| | | | |
| * | | | Fix issue where if given a balance that does not need to be parsed will not ↵Frankie2016-08-203-7/+10
|/ / / / | | | | | | | | | | | | be parsed
| | | * Modify logic for component update.Kevin Serrano2016-08-201-5/+4
| | | |
| | | * Create replacement logo for non-webglKevin Serrano2016-08-202-3/+10
| |_|/ |/| |
* | | Merge pull request #559 from MetaMask/shapeshiftTxDan Finlay2016-08-1918-16/+513
|\ \ \ | |_|/ |/| | Shapeshift tx
| * | Merge branch 'master' into shapeshiftTxDan Finlay2016-08-193-13/+20
| |\ \ | |/ / |/| |
* | | Merge pull request #557 from MetaMask/balance-fixDan Finlay2016-08-193-13/+20
|\ \ \ | |_|/ |/| | Fix rounding issues.
| * | Bump changelog.Kevin Serrano2016-08-191-0/+1
| | |
| * | Lint and changelog.Kevin Serrano2016-08-191-2/+2
| | |
| * | Fix rounding issues.Kevin Serrano2016-08-192-14/+20
|/ /
| * Remove "+" from shapeshift tx and change wording in CHANGELOGFrankie2016-08-192-22/+8
| |
| * Delete npm-debug.logFrankie2016-08-191-49/+0
| |
| * Create a dev state with shapeshift txFrankie2016-08-193-1/+213
| |
| * Make ballance teal for shapeshift tx and add to change logFrankie2016-08-193-3/+7
| |
| * Create a ShapeShift tx in tx HistoryFrankie2016-08-198-65/+105
| |
| * Add api Public keyFrankie2016-08-191-0/+2
| |
| * Merge branch 'master' into shapeshiftTxFrankie2016-08-1924-15/+401
| |\ | |/ |/|
* | Merge pull request #520 from MetaMask/usd-conversionDan Finlay2016-08-1721-13/+390
|\ \ | | | | | | Conversion implementation
| * | Added compliance for tests and properly accounts for N/A conversions.Kevin Serrano2016-08-174-12/+11
| | |
| * | Lint.Kevin Serrano2016-08-171-4/+5
| | |
| * | Remove logs.Kevin Serrano2016-08-171-3/+0
| | |
| * | Hide conversions when API fails.Kevin Serrano2016-08-171-29/+42
| | |
| * | Remove npm debug log.Kevin Serrano2016-08-171-46/+0
| | |
| * | Fix uncalled fn.Kevin Serrano2016-08-171-1/+1
| | |
| * | Add to changelog.Kevin Serrano2016-08-171-0/+2
| | |
| * | Change account list balance rendering.Kevin Serrano2016-08-172-3/+6
| | |
| * | Remove console logs.Kevin Serrano2016-08-172-2/+46
| | |
| * | Add recent conversion date.Kevin Serrano2016-08-171-0/+4
| | |
| * | Add fallback to API failure.Kevin Serrano2016-08-172-1/+7
| | |
| * | Remove react-select as dependency.Kevin Serrano2016-08-172-8/+0
| | |
| * | Remove logging. Clean up duplicate entries in currency list.Kevin Serrano2016-08-173-4/+2
| | |
| * | Add to package request-promise.Kevin Serrano2016-08-171-0/+1
| | |
| * | Merge branch 'master' into usd-conversionKevin Serrano2016-08-172-1/+3
| |\ \ | |/ / |/| |
* | | Merge pull request #550 from MetaMask/Version2.8.0Frankie2016-08-162-1/+3
|\ \ \ | | | | | | | | Version 2.8.0
| * | | Version 2.8.0Dan Finlay2016-08-162-1/+3
|/ / /
| * | Remove extra test.Kevin Serrano2016-08-172-50/+0
| | |
| * | linting and ignoring.Kevin Serrano2016-08-178-15/+55
| | |
| * | Divided eth components for tx and account detail.Kevin Serrano2016-08-174-16/+129
| | |
| * | Merge master.Kevin Serrano2016-08-1631-185/+1309
| |\ \ | |/ / |/| |
* | | Merge pull request #547 from MetaMask/cssFixesDan Finlay2016-08-152-1/+8
|\ \ \ | | | | | | | | Add margin to "go to test faucet" button and show more of the address…
| * | | Add margin to "go to test faucet" button and show more of the address on qr ↵Frankie2016-08-152-1/+8
|/ / / | | | | | | | | | code page
| * | Did not previously call functions before!Kevin Serrano2016-08-102-3/+6
| | |
| * | Fix default value. Add loading indication for async.Kevin Serrano2016-08-103-4/+6
| | |
| * | Enable full listing of supported currencies by Cryptonator.Kevin Serrano2016-08-103-6/+16
| | |
| * | Add fix for zero balance shorten.Kevin Serrano2016-08-083-2/+4
| | |
| * | Get fiat numbers rendering on tooltip. Need to find way to create line breaks.Kevin Serrano2016-08-067-14/+33
| | |
| * | Holding off on select formatting for now. Renamed keys for options.Kevin Serrano2016-08-054-7/+7
| | |
| * | Create default values for metamask state for conversion. Fix config files ↵Kevin Serrano2016-08-053-3/+9
| | | | | | | | | | | | for ui dev.
| * | currency now selectable and save-able.Kevin Serrano2016-08-053-2/+26
| | |
| * | Merge branch 'master' into usd-conversionKevin Serrano2016-08-0522-81/+253
| |\ \
| * \ \ Merge branch 'master' into usd-conversionKevin Serrano2016-07-268-3/+74
| |\ \ \
| * \ \ \ Merge branch 'master' into usd-conversionKevin Serrano2016-07-269-19/+237
| |\ \ \ \
| * \ \ \ \ Fix merge conflicts. Fix typos. Ensure currency immediately updated on load.Kevin Serrano2016-07-2312-12/+224
| |\ \ \ \ \
| * | | | | | Linting!Kevin Serrano2016-07-234-6/+8
| | | | | | |
| * | | | | | Change function names. Add interval polling for api. Refactor functions.Kevin Serrano2016-07-223-11/+34
| | | | | | |
| * | | | | | Add date access throughout the data flow.Kevin Serrano2016-07-225-4/+8
| | | | | | |
| * | | | | | Provide date access.Kevin Serrano2016-07-221-1/+8
| | | | | | |
| * | | | | | Merge branch 'master' into usd-conversionKevin Serrano2016-07-2218-39/+178
| |\ \ \ \ \ \
| * | | | | | | Add data field to pass up parameters up to reducer.Kevin Serrano2016-07-224-3/+20
| | | | | | | |
| * | | | | | | Add fiat actions to metamask controllere and actions.Kevin Serrano2016-07-222-0/+24
| | | | | | | |
| * | | | | | | Progress on config manager. Plus tests.Kevin Serrano2016-07-212-1/+108
| | | | | | | |
| | | | | | | * WIP: ShapeShift txFrankie2016-08-1911-12/+314
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #544 from MetaMask/RemoveEtckumavis2016-08-157-33/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove ethereum classic provider
| * | | | | | | Remove ethereum classic providerDan Finlay2016-08-157-33/+4
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes #542
* | | | | | | Merge pull request #529 from MetaMask/buyFormkumavis2016-08-1411-12/+1060
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Buy form
| * | | | | | | Add to change logFrankie2016-08-141-1/+2
| | | | | | | |
| * | | | | | | Add multi message capability to Qr view for market infoFrankie2016-08-134-6/+27
| | | | | | | |
| * | | | | | | Add a to test faucet buttonFrankie2016-08-131-1/+4
| | | | | | | |
| * | | | | | | Merge branch 'buyForm' of https://github.com/MetaMask/metamask-plugin into ↵Frankie2016-08-130-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | buyForm
| | * \ \ \ \ \ \ Merge branch 'master' into buyFormDan Finlay2016-08-126-101/+10
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge branch 'master' into buyFormFrankie2016-08-1318-140/+230
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #538 from MetaMask/i512Kevin Serrano2016-08-133-25/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | deps - extracted ensnare to module
| * | | | | | | | | | deps - extracted ensnare to modulekumavis2016-08-133-25/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #535 from MetaMask/CustomRpcLoadingBugkumavis2016-08-125-2/+194
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Custom rpc loading bug
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into CustomRpcLoadingBugkumavis2016-08-125-12/+24
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #532 from MetaMask/logging-fixkumavis2016-08-125-12/+24
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | Logging fix
| * | | | | | | | | | Add global var for background.Kevin Serrano2016-08-124-5/+15
| | | | | | | | | | |
| * | | | | | | | | | Merge github.com:MetaMask/metamask-plugin into logging-fixKevin Serrano2016-08-126-101/+10
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | UI logging supressed for production.Kevin Serrano2016-08-122-6/+1
| | | | | | | | | | |
| * | | | | | | | | | Create global variable that changes ui logging.Kevin Serrano2016-08-124-15/+13
| | | | | | | | | | |
| * | | | | | | | | | Setting defaults to production.Kevin Serrano2016-08-122-3/+1
| | | | | | | | | | |
| * | | | | | | | | | Separate developmentMode conditional to only wrap log.Kevin Serrano2016-08-121-2/+4
| | | | | | | | | | |
| * | | | | | | | | | Cosmetic difference.Kevin Serrano2016-08-121-2/+1
| | | | | | | | | | |
| * | | | | | | | | | Remove stray console.logKevin Serrano2016-08-121-1/+0
| | | | | | | | | | |
| * | | | | | | | | | Take out unused dependency.Kevin Serrano2016-08-122-4/+1
| | | | | | | | | | |
| * | | | | | | | | | Remove comments.Kevin Serrano2016-08-121-12/+0
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into logging-fixKevin Serrano2016-08-123-4/+9
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | LintKevin Serrano2016-08-122-3/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Add ability to hide logging messages in production.Kevin Serrano2016-08-124-8/+34
| | | | | | | | | | | |
| | | * | | | | | | | | Add state selector to mock-dev server used by UI testsDan Finlay2016-08-121-0/+3
| | | | | | | | | | | |
| | | * | | | | | | | | Added buggy state file to states folderDan Finlay2016-08-122-1/+1
| | | | | | | | | | | |
| | | * | | | | | | | | Add network indicator class to loading imageDan Finlay2016-08-122-1/+190
| |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #533 from MetaMask/inpage-fixeskumavis2016-08-126-101/+10
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | inpage and stream provider fixes
| * | | | | | | | | | changelog - add note about web3-provider-stream fixkumavis2016-08-121-0/+1
| | | | | | | | | | |
| * | | | | | | | | | inpage-prov - sync error - fix linkkumavis2016-08-121-1/+1
| | | | | | | | | | |
| * | | | | | | | | | deps - bump web3-stream-providerkumavis2016-08-121-1/+1
| | | | | | | | | | |
| * | | | | | | | | | deps - local-message-stream extracted as module post-message-streamkumavis2016-08-124-58/+3
| | | | | | | | | | |
| * | | | | | | | | | clean -formattingkumavis2016-08-121-2/+2
| | | | | | | | | | |
| * | | | | | | | | | inpage-provider - remove createSyncProvider, just failkumavis2016-08-121-40/+3
|/ / / / / / / / / /
| | * | | | | | | | Change buy forms so that they are their own view and add Qr-codeFrankie2016-08-139-184/+256
| | | | | | | | | |
| | * | | | | | | | Even out some of the marginsFrankie2016-08-111-2/+4
| | |/ / / / / / /
| | * | | | | | | Fix typo for copyButtonFrankie2016-08-111-1/+1
| | | | | | | | |
| | * | | | | | | Fix merge messFrankie2016-08-114-14/+108
| | | | | | | | |
| | * | | | | | | Merge branch 'master' into buyFormFrankie2016-08-1153-127/+852
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #528 from MetaMask/checkout-fixFrankie2016-08-113-4/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Fix ether warning checkbox to reflect proper behavior.
| * | | | | | | | Merge branch 'master' into checkout-fixKevin Serrano2016-08-111-0/+1
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #527 from MetaMask/testskumavis2016-08-111-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | Add testem to devDependencies
| * | | | | | | | Add testem to devDependenciesFrankie2016-08-111-0/+1
|/ / / / / / / /
| * / / / / / / Fix ether warning checkbox.Kevin Serrano2016-08-113-4/+9
|/ / / / / / /
* | | | | | | Merge pull request #518 from MetaMask/typo-fixKevin Serrano2016-08-053-2/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Typo fix for apostrophes
| * | | | | | | Add to changelog.Kevin Serrano2016-08-051-0/+2
| | | | | | | |
| * | | | | | | Fix typos with missing apostropheKevin Serrano2016-08-052-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #517 from MetaMask/i#516Frankie2016-08-041-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix #516 issue with dropdown menu
| * | | | | | | Fix issue with dropdown menuFrankie2016-08-041-0/+1
|/ / / / / / /
* | | | | | | Merge pull request #508 from MetaMask/FixAccountSelectionBugDan Finlay2016-07-303-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix account selection bug
| * | | | | | | Version 2.7.3Dan Finlay2016-07-301-1/+1
| | | | | | | |
| * | | | | | | Bump changelogDan Finlay2016-07-301-0/+4
| | | | | | | |
| * | | | | | | Fix account selection updatingDan Finlay2016-07-301-0/+1
|/ / / / / / /
* | | | | | | Merge pull request #507 from MetaMask/Version2.7.2Version2.7.2Dan Finlay2016-07-302-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Version 2.7.2
| * | | | | | | Version 2.7.2Dan Finlay2016-07-302-1/+3
|/ / / / / / /
* | | | | | | Merge pull request #506 from MetaMask/FixNetworkReferenceDan Finlay2016-07-302-3/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix network name reference
| * | | | | | | Fix reference in drop menu itemDan Finlay2016-07-301-2/+3
| | | | | | | |
| * | | | | | | Fix network name referenceDan Finlay2016-07-301-1/+6
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | When adding the classic network to the menu, I left a reference to a property that is not always existent, so we needed a fallback for it.
* | | | | | | Merge pull request #498 from MetaMask/AddEthClassickumavis2016-07-2910-10/+52
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add eth classic
| * \ \ \ \ \ \ Merge branch 'master' into AddEthClassicDan Finlay2016-07-292-1/+2
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #500 from MetaMask/FixRemoteStoreBugDan Finlay2016-07-292-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix broken reference to host store.didUpdate
| * \ \ \ \ \ \ \ Merge branch 'master' into FixRemoteStoreBugDan Finlay2016-07-292-19/+32
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix broken reference to host store.didUpdateDan Finlay2016-07-292-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'd returned this line because it seemed to fix Firefox compatibility, now it seems like that wasn't the case. Removing it again.
| | * | | | | | | Merge branch 'master' into AddEthClassicDan Finlay2016-07-292-19/+32
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #502 from MetaMask/ParallelCopyTasksDan Finlay2016-07-291-18/+31
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix some gulp task issues
| * | | | | | | | | Fix some gulp task issuesDan Finlay2016-07-291-18/+31
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I know, I've been fixing up the gulp scripts all week. I keep fixing one thing then breaking another. In this commit, I fix some issues with some previous approaches. I no longer try to do the copying to `chrome` after `firefox`, I simply stream to both during copy and build tasks, and that logic is reused during dev and build tasks. The `copyTask` function now supports an array of `destinations`, that allows piping to multiple destinations, which is pretty cool. The `manifest:cleanup` task that chrome requires is now just part of the `copy` task, so we don't have to remember it everywhere we copy. So obvious it's like why only now.
* | | | | | | | | Merge pull request #501 from MetaMask/UpdateNodeDependencyDan Finlay2016-07-291-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | Update readme node version
| * | | | | | | | Update readme node versionDan Finlay2016-07-291-1/+1
|/ / / / / / / /
| * | | | | | | Merge branch 'master' into AddEthClassicDan Finlay2016-07-290-0/+0
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #499 from MetaMask/FixDevScriptsDan Finlay2016-07-291-10/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix dev tasks for multi browser copying
| | * | | | | | | LintedDan Finlay2016-07-291-1/+1
| | | | | | | | |
| | * | | | | | | Add missing reference for providerDan Finlay2016-07-291-1/+1
| | | | | | | | |
| | * | | | | | | Bump changelogDan Finlay2016-07-291-0/+2
| | | | | | | | |
| | * | | | | | | Fix margin on provider checkmarksDan Finlay2016-07-291-0/+1
| | | | | | | | |
| | * | | | | | | Add eth classic to provider menuDan Finlay2016-07-298-10/+50
| |/ / / / / / /
| * / / / / / / Fix dev tasks for multi browser copyingDan Finlay2016-07-291-10/+15
|/ / / / / / /
* | | | | | | Merge pull request #497 from MetaMask/FixBuildDan Finlay2016-07-281-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix nondeterministic build
| * | | | | | | Fix nondeterministic buildDan Finlay2016-07-281-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to be able to copy static resources while we built js, but now part of the copy task is copying firefox built files into chrome, so they need to be done in order. This could probably be optimized a bit more, but for now it builds reliably again.
* | | | | | | Merge pull request #496 from MetaMask/Version2.7.1Dan Finlay2016-07-282-2/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Version 2.7.1
| * | | | | | | Version 2.7.1Dan Finlay2016-07-282-2/+4
|/ / / / / / /
* | | | | | | Merge pull request #493 from MetaMask/droppo-fixDan Finlay2016-07-273-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Droppo fix
| * | | | | | | Changelog add.Kevin Serrano2016-07-271-0/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' into droppo-fixKevin Serrano2016-07-2712-54/+143
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #492 from MetaMask/FixChromeBuildDan Finlay2016-07-273-7/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix chrome build
| * | | | | | | | Correct typo commentDan Finlay2016-07-271-1/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into FixChromeBuildDan Finlay2016-07-270-0/+0
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #491 from MetaMask/FixChromeBuildDan Finlay2016-07-271-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix chrome build
| | * | | | | | | | Fix copy taskDan Finlay2016-07-271-1/+0
| | | | | | | | | |
| | * | | | | | | | Enhance manifest detailsDan Finlay2016-07-271-2/+2
| | | | | | | | | |
| | * | | | | | | | Cleanup ChangelogDan Finlay2016-07-271-2/+3
| | | | | | | | | |
| | * | | | | | | | Merge remote-tracking branch 'origin/Version2.7.0' into FixChromeBuildDan Finlay2016-07-272-1/+3
| |/| | | | | | | |
| | * | | | | | | | Version 2.7.02.7.0Dan Finlay2016-07-222-1/+3
| | | | | | | | | |
| * | | | | | | | | Fix chrome buildDan Finlay2016-07-271-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #489 from MetaMask/FixDeployStepsDan Finlay2016-07-271-5/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixed deploy instructions
| * | | | | | | | | Fixed deploy instructionsDan Finlay2016-07-271-5/+5
|/ / / / / / / / /
* | | | | | | | | Merge pull request #488 from MetaMask/BuildsFolderDan Finlay2016-07-272-4/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Store versioned builds in builds folder
| * | | | | | | | | Store versioned builds in builds folderDan Finlay2016-07-272-4/+7
|/ / / / / / / / /
* | | | | | | | | Add platform specific builds and zip tasks (#486)Dan Finlay2016-07-278-30/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add platform specific folders to dist folder * Remove gulp hacks * Add platform specific bundling dev and dist tasks now build into platform-specific folders within the `dist` folder. Added tasks `gulp zip` and `gulp dist`. `zip` builds the platform-specific folders into platform-specific bundles within the `dist` folder. `dist` builds and then zips all at once. * Fix chrome bundle zipping * Fix broken reference in eth warning * Fix but where web3.eth.accounts are not available in firefox. * Bump changelog
* | | | | | | | | Merge pull request #482 from MetaMask/FirefoxCompatibilitykumavis2016-07-268-19/+77
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | Fix inpage script race condition
| * | | | | | | | Bump changelogDan Finlay2016-07-261-0/+1
| | | | | | | | |
| * | | | | | | | Fix integration testsDan Finlay2016-07-261-4/+19
| | | | | | | | |
| * | | | | | | | Fix extension testsDan Finlay2016-07-265-7/+20
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into FirefoxCompatibilityDan Finlay2016-07-260-0/+0
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Inject inpage script synchronouslyDan Finlay2016-07-263-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Huge thanks to the Firefox team, for their help on the issue of our long-standing inpage script race condition. http://stackoverflow.com/questions/38577656/how-can-i-make-a-firefox-add-on-contentscript-inject-and-run-a-script-before-oth The problem is that we were injecting a `script` tag and assigning its `src` attribute, which triggers an asynchronous fetch request, and does not guarantee execution order! (That was news to me!) Instead, I'm now assigning the `script` tag a `textContent` value of the script to inject, and it seems to fix the problem! There is also a Firefox-only API that could solve this whole problem in an even more elegant way, so we might want to expose a code path for that solution later on: https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XPCOM/Language_Bindings/Components.utils.exportFunction Allows you to expose an object from one scope to another. There was even talk of creating a polyfill for it that does virtually what we do, message passing between contexts.
| * | | | | | | | Add note about firefox stackoverflow to readmeDan Finlay2016-07-261-0/+2
| | | | | | | | |
| * | | | | | | | Add note about mozilla ircDan Finlay2016-07-261-0/+2
| | | | | | | | |
| * | | | | | | | Clean up extension polyfill abstractionDan Finlay2016-07-262-14/+14
| | | | | | | | |
| * | | | | | | | Add firefox instructions to readmeDan Finlay2016-07-261-0/+10
| | | | | | | | |
| * | | | | | | | Allow page injection to look for cross-browser APIs appropriatelyDan Finlay2016-07-261-1/+2
| | | | | | | | |
| * | | | | | | | Correct skip usageDan Finlay2016-07-232-3/+4
| | | | | | | | |
| * | | | | | | | Fix promise usage?Dan Finlay2016-07-231-1/+3
| | | | | | | | |
| * | | | | | | | Run browser tests in parallelDan Finlay2016-07-231-1/+1
| | | | | | | | |
| * | | | | | | | Skip PhantomJS in testemDan Finlay2016-07-233-2/+1
| | | | | | | | |
| * | | | | | | | Add promise polyfill for PhantomJSDan Finlay2016-07-233-0/+3
| | | | | | | | |
| * | | | | | | | Fix testem runner pageDan Finlay2016-07-233-7/+2
| | | | | | | | |
| * | | | | | | | Remove phantom from build depsDan Finlay2016-07-231-1/+0
| | | | | | | | |
| * | | | | | | | Move pre scripts to dependencies keyDan Finlay2016-07-231-0/+1
| | | | | | | | |
| * | | | | | | | Fix circle pre scriptDan Finlay2016-07-231-3/+3
| | | | | | | | |
| * | | | | | | | Add testem and phantom to circleCI pre-scriptDan Finlay2016-07-231-0/+3
| | | | | | | | |
| * | | | | | | | Add UI tests to CI test scriptDan Finlay2016-07-231-1/+1
| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 19:29:45 +0800