aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Merge pull request #528 from MetaMask/checkout-fixFrankie2016-08-113-4/+9
| |\
| | * Merge branch 'master' into checkout-fixKevin Serrano2016-08-111-0/+1
| | |\ | | |/ | |/|
| | * Fix ether warning checkbox.Kevin Serrano2016-08-113-4/+9
* | | LintKevin Serrano2016-08-122-3/+3
* | | Add ability to hide logging messages in production.Kevin Serrano2016-08-124-8/+34
|/ /
* | Merge pull request #527 from MetaMask/testskumavis2016-08-111-0/+1
|\ \ | |/ |/|
| * Add testem to devDependenciesFrankie2016-08-111-0/+1
|/
* 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
|/ /
* / 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
| | * | LintedDan Finlay2016-07-124-17/+10
| | * | Fix svg icon in notificationDan Finlay2016-07-121-0/+2
| | * | Merge branch 'master' into FixSvgIconsDan Finlay2016-07-122-1/+3
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #426 from MetaMask/Version26Dan Finlay2016-07-122-1/+3
|\ \ \ \
| * | | | Version 2.6Dan Finlay2016-07-122-1/+3
|/ / / /
| | * | Rebuild states objectDan Finlay2016-07-121-1/+1
| | * | Fix imageification of recipientDan Finlay2016-07-121-3/+4
| | * | Add coin sending tx stateDan Finlay2016-07-121-0/+1
| | * | Add notification global for developmentDan Finlay2016-07-121-1/+3
| |/ / |/| |
| | * Merge branch 'master' into FixMenuBugDan Finlay2016-07-121-2/+9
| | |\ | |_|/ |/| |
* | | Merge pull request #424 from MetaMask/UpdateScriptDan Finlay2016-07-121-2/+9
|\ \ \ | |/ / |/| |
| * | Updated script for what I recorded.Dan Finlay2016-07-121-2/+9
|/ /
| * Fix main dropdown animationDan Finlay2016-07-121-2/+2
|/
* Merge pull request #418 from MetaMask/ui-fixth-width-tx-historykumavis2016-07-095-7/+100
|\
| * lintKevin Serrano2016-07-091-5/+5
| * Implement alternate shortening scheme.Kevin Serrano2016-07-093-7/+26
| * Merge branch 'master' of github.com:MetaMask/metamask-plugin into ui-fixth-wi...kumavis2016-07-082-18/+51
| |\ | |/ |/|
* | Merge pull request #419 from MetaMask/ConfirmationStylekumavis2016-07-082-18/+51
|\ \
| * | eth-balance fixkumavis2016-07-081-1/+10
| * | lint - dingle dangle comma tanglekumavis2016-07-081-1/+1
| * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into Confirmatio...kumavis2016-07-081-10/+1
| |\ \ | |/ / |/| |
| * | notif - add support for forward carratkumavis2016-07-081-13/+41
| * | ui - remove doubled eth-balancekumavis2016-07-082-5/+1
| | * Resolve merge conflict.Kevin Serrano2016-07-0821-72/+593
| | |\ | |_|/ |/| |
* | | Merge pull request #417 from MetaMask/FixEthBalanceStyleDan Finlay2016-07-081-10/+1
|\ \ \ | |/ / |/| |
| * | Fixed eth_balance style, completing partial mergeDan Finlay2016-07-081-10/+1
|/ /
* | Merge pull request #406 from MetaMask/ConfirmationStyleDan Finlay2016-07-0821-73/+603
|\ \
| * \ Merge branch 'master' of github.com:MetaMask/metamask-plugin into Confirmatio...kumavis2016-07-085-3/+116
| |\ \ | |/ / |/| |
| * | lint fixkumavis2016-07-081-1/+1
| * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into Confirmatio...kumavis2016-07-082-21/+48
| |\ \
| * | | Restore button naming consistencyDan Finlay2016-07-081-2/+2
| * | | Add nickname rendering for recipient addressDan Finlay2016-07-083-5/+63
| * | | LintedDan Finlay2016-07-082-2/+2
| * | | Refined tx confirmation button stylesDan Finlay2016-07-081-7/+19
| * | | Implement tx confirmation style refinementsDan Finlay2016-07-084-24/+38
| * | | Add configurable params to eth-balanceDan Finlay2016-07-081-10/+17
| * | | Make mini account panel labels fully configurableDan Finlay2016-07-082-28/+42
| * | | Remove formatBalance.formatted referencesDan Finlay2016-07-081-4/+4
| * | | Merge branch 'master' into ConfirmationStyleDan Finlay2016-07-084-52/+52
| |\ \ \
| * \ \ \ Merge branch 'ConfirmationStyle' of github.com:MetaMask/metamask-plugin into ...Dan Finlay2016-07-070-0/+0
| |\ \ \ \
| | * | | | Correct data length calculationDan Finlay2016-07-071-1/+1
| * | | | | Correct data length calculationDan Finlay2016-07-071-1/+1
| |/ / / /
| * | | | Update gas costDan Finlay2016-07-071-1/+1
| * | | | Fix sender balance rendering in pending tx detailsDan Finlay2016-07-071-1/+4
| * | | | Simplify ui dev mode styleDan Finlay2016-07-072-2/+2
| * | | | Bump changelogDan Finlay2016-07-071-0/+1
| * | | | Merge branch 'master' into ConfirmationStyleDan Finlay2016-07-075-9/+12
| |\ \ \ \
| * | | | | LintedDan Finlay2016-07-072-29/+6
| * | | | | Fixed up pending-tx-detailsDan Finlay2016-07-075-25/+29
| * | | | | Fleshed out pending tx viewDan Finlay2016-07-076-32/+87
| * | | | | Merged latest balance formatting codeDan Finlay2016-07-076-46/+48
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into ConfirmationStyleDan Finlay2016-07-0710-41/+55
| |\ \ \ \ \ \
| * | | | | | | Began reworking tx conf viewDan Finlay2016-07-0714-19/+394
| * | | | | | | Simplify empty account balance renderingDan Finlay2016-07-062-2/+2
| | | | | | | * Pass the linters.Kevin Serrano2016-07-081-5/+5
| | | | | | | * Remove reducer console log.Kevin Serrano2016-07-081-1/+0
| | | | | | | * Modify changelog.Kevin Serrano2016-07-081-0/+1
| | | | | | | * Add new component for tx-history to avoid messing with other styles. Add fixe...Kevin Serrano2016-07-083-2/+72
| | | | | | | * Modified test views again. Added fixed length to center tx information.Kevin Serrano2016-07-084-4/+8
| | | | | | | * Merge branch 'master' into ui-fixth-width-tx-historyKevin Serrano2016-07-080-0/+0
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge pull request #413 from MetaMask/ui-fixDan Finlay2016-07-085-3/+116
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| | | | | | | * Modify development states to account for long domains.Kevin Serrano2016-07-082-3/+3
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Remove logging for states.Kevin Serrano2016-07-081-1/+0
| * | | | | | Add new test state with tx history. Fix alignment issue with transaction hist...Kevin Serrano2016-07-085-3/+117
|/ / / / / /
* | | | | | Merge pull request #412 from MetaMask/ethBalanceDan Finlay2016-07-082-17/+34
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Change function name to generateBalanceObjectFrankie2016-07-082-4/+4
| * | | | | Add method to deal with small decimals and create the object for eth-balance ...Frankie2016-07-082-17/+34
|/ / / / /
* | | | | Merge pull request #410 from MetaMask/cleanupEthbugDan Finlay2016-07-083-45/+45
|\ \ \ \ \
| * | | | | Revert back to original formatBalanceFrankie2016-07-083-45/+45
|/ / / / /
* | | | | Merge pull request #408 from MetaMask/FixNoDeclineCallbackkumavis2016-07-081-8/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix bug where rejected tx would not call backDan Finlay2016-07-081-8/+7
|/ / / /
* | | | Merge pull request #404 from MetaMask/fastinjectkumavis2016-07-071-1/+1
|\ \ \ \
| * | | | contentscript - remove timeout before stream setupkumavis2016-07-071-1/+1
|/ / / /
* | | | Merge pull request #403 from MetaMask/fastinjectkumavis2016-07-073-5/+7
|\ \ \ \
| * \ \ \ Merge branch 'master' of github.com:MetaMask/metamask-plugin into fastinjectkumavis2016-07-072-3/+4
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #402 from MetaMask/z-position-fixDan Finlay2016-07-072-3/+4
|\ \ \ \ \
| * | | | | Fix dropdown z-index issue.Kevin Serrano2016-07-072-3/+4
|/ / / / /
| * | | | appease the linting godskumavis2016-07-072-4/+1
| * | | | changelog - add web3 min distkumavis2016-07-071-0/+1
| * | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into fastinjectkumavis2016-07-076-46/+49
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #401 from MetaMask/ethBalanceDan Finlay2016-07-071-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Handle to small of balances with "<0.00001"Frankie2016-07-071-1/+1
|/ / / /
* | | | Merge pull request #399 from MetaMask/ethBalanceDan Finlay2016-07-076-46/+49
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add a postion option for tool tipFrankie2016-07-073-1/+4
| * | | Add decimal hendeling to ETH balanceFrankie2016-07-074-45/+45
|/ / /
| * / web3 injection - use web3 dist for faster injectionkumavis2016-07-072-5/+9
|/ /
* | Merge pull request #392 from MetaMask/kumavis-patch-1Kevin Serrano2016-07-071-2/+2
|\ \
| * | readme - camel case MetaMaskkumavis2016-07-071-2/+2
|/ /
* | Merge pull request #387 from MetaMask/ui-formattingDan Finlay2016-07-072-23/+26
|\ \
| * | Add to changelog.Kevin Serrano2016-07-061-0/+1
| * | Move account balance down a row. Adjusted positioning of buttons.Kevin Serrano2016-07-061-23/+25
* | | Merge pull request #388 from MetaMask/script-editsDan Finlay2016-07-061-9/+9
|\ \ \
| * | | Edits to the script ya know.Kevin Serrano2016-07-061-9/+9
* | | | Merge pull request #389 from MetaMask/thinFontDan Finlay2016-07-066-5/+14
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' into thinFontFrankie2016-07-063-3/+32
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #385 from MetaMask/ImprovedLoggingDan Finlay2016-07-061-2/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Simplify error logDan Finlay2016-07-061-2/+1
| * | | Improve metamask-controller error loggingDan Finlay2016-07-061-2/+5
| | |/ | |/|
* | | Add video script draftDan Finlay2016-07-061-0/+27
* | | Add state list rebuilding on ui taskDan Finlay2016-07-061-1/+1
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 05:01:43 +0800