aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add a back button on lock screen to go back to init menuFrankie2016-08-266-43/+141
* Merge pull request #568 from MetaMask/Version2.9.0Dan Finlay2016-08-232-1/+3
|\
| * Version 2.9.0Dan Finlay2016-08-232-1/+3
|/
* Merge pull request #562 from MetaMask/ethBalanceDan Finlay2016-08-234-8/+16
|\
| * Add testFrankie2016-08-201-1/+6
| * Fix issue where if given a balance that does not need to be parsed will not b...Frankie2016-08-203-7/+10
|/
* Merge pull request #559 from MetaMask/shapeshiftTxDan Finlay2016-08-1918-16/+513
|\
| * Merge branch 'master' into shapeshiftTxDan Finlay2016-08-193-13/+20
| |\ | |/ |/|
* | Merge pull request #557 from MetaMask/balance-fixDan Finlay2016-08-193-13/+20
|\ \
| * | 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
|\ \
| * | 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.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 on qr c...Frankie2016-08-152-1/+8
|/ / /
| * | 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 for...Kevin Serrano2016-08-053-3/+9
| * | 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 providerDan Finlay2016-08-157-33/+4
|/ / / / / / /
* | | | | | | Merge pull request #529 from MetaMask/buyFormkumavis2016-08-1411-12/+1060
|\ \ \ \ \ \ \
| * | | | | | | 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 bu...Frankie2016-08-130-0/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ 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 modulekumavis2016-08-133-25/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #535 from MetaMask/CustomRpcLoadingBugkumavis2016-08-125-2/+194
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into CustomRpcLoadingBugkumavis2016-08-125-12/+24
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #532 from MetaMask/logging-fixkumavis2016-08-125-12/+24
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | 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 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
|\ \ \ \ \ \ \
| * | | | | | | 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 issue with dropdown menuFrankie2016-08-041-0/+1
|/ / / / / / /
* | | | | | | Merge pull request #508 from MetaMask/FixAccountSelectionBugDan Finlay2016-07-303-1/+6
|\ \ \ \ \ \ \
| * | | | | | | 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.2Dan Finlay2016-07-302-1/+3
|/ / / / / / /
* | | | | | | Merge pull request #506 from MetaMask/FixNetworkReferenceDan Finlay2016-07-302-3/+9
|\ \ \ \ \ \ \
| * | | | | | | Fix reference in drop menu itemDan Finlay2016-07-301-2/+3
| * | | | | | | Fix network name referenceDan Finlay2016-07-301-1/+6
|/ / / / / / /
* | | | | | | Merge pull request #498 from MetaMask/AddEthClassickumavis2016-07-2910-10/+52
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into AddEthClassicDan Finlay2016-07-292-1/+2
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #500 from MetaMask/FixRemoteStoreBugDan Finlay2016-07-292-1/+3
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into FixRemoteStoreBugDan Finlay2016-07-292-19/+32
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix broken reference to host store.didUpdateDan Finlay2016-07-292-1/+3
| | * | | | | | | 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 issuesDan Finlay2016-07-291-18/+31
|/ / / / / / / / /
* | | | | | | | | Merge pull request #501 from MetaMask/UpdateNodeDependencyDan Finlay2016-07-291-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | 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
|\ \ \ \ \ \ \ \
| | * | | | | | | 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 buildDan Finlay2016-07-281-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #496 from MetaMask/Version2.7.1Dan Finlay2016-07-282-2/+4
|\ \ \ \ \ \ \
| * | | | | | | Version 2.7.1Dan Finlay2016-07-282-2/+4
|/ / / / / / /
* | | | | | | Merge pull request #493 from MetaMask/droppo-fixDan Finlay2016-07-273-0/+3
|\ \ \ \ \ \ \
| * | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 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 instructionsDan Finlay2016-07-271-5/+5
|/ / / / / / / / /
* | | | | | | | | Merge pull request #488 from MetaMask/BuildsFolderDan Finlay2016-07-272-4/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | 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
* | | | | | | | | Merge pull request #482 from MetaMask/FirefoxCompatibilitykumavis2016-07-268-19/+77
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | 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
| * | | | | | | | 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
| * | | | | | | | Separate UI tests from normal unit test suiteDan Finlay2016-07-233-6/+11
| * | | | | | | | Add UI Testing Framework and Simple UI TestDan Finlay2016-07-236-0/+63
| | |_|_|_|_|_|/ | |/| | | | | |
| | | * | | | | Fix menu droppo issues caused by Chrome 52.Kevin Serrano2016-07-272-0/+2
| |_|/ / / / / |/| | | | | |
* | | | | | | Ui testing (#481)Dan Finlay2016-07-268-3/+74
|/ / / / / /
* | | | | | Merge pull request #477 from MetaMask/MockDevKevin Serrano2016-07-229-19/+237
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add mock dev modeDan Finlay2016-07-229-19/+237
|/ / / / /
* / / / / Manifest fix for firefox-specific field (#475)Kevin Serrano2016-07-222-5/+1
|/ / / /
* | | / Buy button (#474)Frankie2016-07-2211-3/+211
| |_|/ |/| |
* | | Implement some cross-browser practices (#473)Dan Finlay2016-07-2214-35/+139
* | | Make injected web3 fail hard on sync methods (#471)Dan Finlay2016-07-212-1/+11
* | | Version 2.6.2 (#470)2.6.2Dan Finlay2016-07-212-1/+3
* | | Add instructions for taking a state dump (#469)Dan Finlay2016-07-211-0/+15
* | | Merge pull request #465 from MetaMask/i447kumavis2016-07-191-2/+10
|\ \ \ | |_|/ |/| |
| * | typo fixkumavis2016-07-191-1/+1
| * | inpage - add try/catch to cleanContextForImportskumavis2016-07-191-2/+10
|/ /
* | Merge pull request #455 from MetaMask/FixReopeningBugKevin Serrano2016-07-193-1/+13
|\ \
| * | Update Changelog to account for last PRKevin Serrano2016-07-191-0/+1
| * | Merge branch 'FixReopeningBug' of github.com:MetaMask/metamask-plugin into Fi...Kevin Serrano2016-07-193-1/+12
|/| |
| * | Merge branch 'master' into FixReopeningBugDan Finlay2016-07-161-0/+8
| |\ \
| * | | Bump changelogDan Finlay2016-07-161-0/+2
| * | | Add ui state logging functionDan Finlay2016-07-161-0/+8
| * | | Triage a strange undefined balance errorDan Finlay2016-07-161-1/+2
* | | | Merge pull request #464 from MetaMask/test-branchKevin Serrano2016-07-190-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'master' of github.com:MetaMask/metamask-pluginKevin Serrano2016-07-191-1/+1
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #463 from MetaMask/aust-zero-changesKevin Serrano2016-07-191-1/+6
|\ \ \ \ \
| * | | | | Readd string to conform to tests. Will discuss later.Kevin Serrano2016-07-191-1/+1
| | * | | | Merge branch 'AustP-master'Kevin Serrano2016-07-191-2/+7
| |/| | | | |/|/ / / /
| * | | | Remove unused None string.Kevin Serrano2016-07-191-1/+1
| * | | | Merge branch 'master' of https://github.com/AustP/metamask-plugin into AustP-...Kevin Serrano2016-07-191-1/+6
|/| | | |
| * | | | Add eslint config to pass testsAust2016-07-191-0/+1
| * | | | Make zero balance display 0. Fixes #449Aust2016-07-181-1/+5
| | |/ / | |/| |
* | | | Merge pull request #459 from Schaeff/transaction-typo-fixkumavis2016-07-191-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix typoThibaut SCHAEFFER2016-07-181-1/+1
|/ / /
| | * Create "buy form" add shape shiftFrankie2016-08-1110-9/+966
| |/ |/|
* | Add simple build instructions (#454)Dan Finlay2016-07-161-0/+8
|/
* Merge pull request #448 from MetaMask/user-agreement-proofreadKevin Serrano2016-07-151-11/+11
|\
| * Merge branch 'master' into user-agreement-proofreadKevin Serrano2016-07-156-26/+83
| |\ | |/ |/|
* | Merge pull request #443 from MetaMask/legal-beagalkumavis2016-07-151-0/+34
|\ \
| * \ Merge branch 'master' into legal-beagalkumavis2016-07-158-30/+59
| |\ \ | |/ / |/| |
* | | Version 2.6.1 (#442)Dan Finlay2016-07-142-1/+3
* | | new tx - calculate estimatedGas and show thing in tx-details (#441)kumavis2016-07-144-25/+46
| * | licensekumavis2016-07-151-0/+34
| | * Proofread and fix spelling errors of user agreement.Kevin Serrano2016-07-151-11/+11
| |/ |/|
* | Fix eth balance tooltip to show 6 decimals (#440)Frankie2016-07-144-4/+10
|/
* Merge pull request #439 from MetaMask/japan-localizationkumavis2016-07-142-1/+11
|\
| * Add Japanese localization file.Kevin Serrano2016-07-141-0/+10
| * Fix MetaMask title for EN.Kevin Serrano2016-07-141-1/+1
|/
* Bump provider-engine from 7.8.1 to 7.8.3 (#435)Kevin Serrano2016-07-142-1/+3
* Move fox logo with filled in eyes into design folder (#433)Frankie2016-07-141-0/+0
* Merge pull request #431 from MetaMask/one-wallet-one-futurekumavis2016-07-132-1/+2
|\
| * Update changelog.Kevin Serrano2016-07-131-0/+1
| * Add one wallet to new accounts instead of three.Kevin Serrano2016-07-131-1/+1
|/
* Merge pull request #423 from MetaMask/FixMenuBugkumavis2016-07-121-2/+2
|\
| * Merge branch 'master' of github.com:MetaMask/metamask-plugin into FixMenuBugkumavis2016-07-1214-191/+106
| |\ | |/ |/|
* | Merge pull request #428 from MetaMask/FixSvgIconsDan Finlay2016-07-127-21/+20
|\ \
| * \ Merge branch 'master' into FixSvgIconsDan Finlay2016-07-127-169/+83
| |\ \ | |/ / |/| |
* | | Merge pull request #427 from MetaMask/balance-refactorDan Finlay2016-07-127-169/+83
|\ \ \
| * \ \ Merge branch 'master' into balance-refactorKevin Serrano2016-07-123-3/+12
| |\ \ \ | |/ / / |/| | |
| * | | Update changelog.Kevin Serrano2016-07-121-0/+2
| * | | Integrate changes back into eth-balanceKevin Serrano2016-07-125-111/+54
| * | | Move shorten balance to util. Add as property of generateBalance object output.Kevin Serrano2016-07-123-23/+28
| * | | Remove unused functions. Readd if necessary.Kevin Serrano2016-07-122-37/+4
| * | | Refactor util tests.Kevin Serrano2016-07-121-11/+8
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 05:00:45 +0800