aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Correctly clear ethStore cache on new vault restoreDan Finlay2016-09-112-13/+38
* Captured #640 in failing testDan Finlay2016-09-112-1/+17
* Camelcase dataset key for reactDan Finlay2016-09-113-8/+8
* Bump changelogDan Finlay2016-09-101-0/+1
* Add new eth-lightwallet salting to vault.Dan Finlay2016-09-102-58/+46
* Merge pull request #636 from MetaMask/how-it-works-bugKevin Serrano2016-09-102-3/+5
|\
| * Update changelogKevin Serrano2016-09-101-1/+1
| * Do not trigger how-to-video on anything but install.Kevin Serrano2016-09-101-2/+4
|/
* Merge pull request #630 from MetaMask/i610-InitOneWalletOnlyKevin Serrano2016-09-102-1/+2
|\
| * Merge branch 'i610-InitOneWalletOnly' of github.com:MetaMask/metamask-plugin ...Kevin Serrano2016-09-102-1/+2
|/|
| * Bump changelogDan Finlay2016-09-091-0/+1
| * Only init one wallet on restoreDan Finlay2016-09-091-1/+1
* | Merge pull request #632 from MetaMask/FixLogoPasswordFollowKevin Serrano2016-09-102-3/+2
|\ \
| * \ Merge branch 'master' into FixLogoPasswordFollowKevin Serrano2016-09-102-0/+3
| |\ \ | |/ / |/| |
* | | Merge pull request #631 from MetaMask/i599-LoginLoadingIndicationKevin Serrano2016-09-102-0/+3
|\ \ \ | |_|/ |/| |
| * | Show loading indication during unlocking.Dan Finlay2016-09-092-0/+3
|/ /
| * Fix fox logo password followingDan Finlay2016-09-092-3/+2
|/
* Merge pull request #629 from MetaMask/FixLogoLeakFrankie2016-09-093-5/+8
|\
| * Merge branch 'master' into FixLogoLeakDan Finlay2016-09-097-9/+17
| |\ | |/ |/|
* | Merge pull request #627 from MetaMask/i#589pendingTxsIssueDan Finlay2016-09-097-9/+17
|\ \
| * \ Merge branch 'i#589pendingTxsIssue' of https://github.com/MetaMask/metamask-p...Frankie2016-09-097-177/+29
| |\ \
| | * \ Merge branch 'master' into i#589pendingTxsIssueFrankie2016-09-097-177/+29
| | |\ \ | |_|/ / |/| | |
| * | | Fix wording in changelog and bugFrankie2016-09-092-2/+2
| |/ /
| * | Remove console.logFrankie2016-09-091-1/+0
| * | Add to CHANGELOG.md and Remove unnecessary catchFrankie2016-09-092-9/+1
| * | Merge branch 'master' into i#589pendingTxsIssueFrankie2016-09-0915-178/+206
| |\ \
| * | | Add network checks for unconfirmed TxsFrankie2016-09-095-8/+25
| * | | Filter out pending txs based on network from tx historyFrankie2016-09-081-1/+1
| | | * Fix new logo related errorsDan Finlay2016-09-093-5/+8
| |_|/ |/| |
* | | Merge pull request #625 from MetaMask/AddNewLogoKevin Serrano2016-09-097-177/+29
|\ \ \ | |_|/ |/| |
| * | Bump changelogDan Finlay2016-09-091-0/+1
| * | Merge branch 'master' into AddNewLogoDan Finlay2016-09-0912-175/+111
| |\ \ | |/ / |/| |
* | | Merge pull request #615 from MetaMask/ModularFiatBalanceKevin Serrano2016-09-0914-177/+205
|\ \ \
| * | | Restore broken variable referenceDan Finlay2016-09-091-0/+1
| * | | Merge branch 'ModularFiatBalance' of github.com:MetaMask/metamask-plugin into...Dan Finlay2016-09-092-2/+1
| |\ \ \
| | * \ \ Merge branch 'master' into ModularFiatBalanceDan Finlay2016-09-092-2/+1
| | |\ \ \ | |_|/ / / |/| | | |
| * | | | Fix double tooltipDan Finlay2016-09-091-10/+1
| |/ / /
| * | | Merge branch 'master' into ModularFiatBalanceDan Finlay2016-09-076-8/+16
| |\ \ \
| * | | | Bump changelogDan Finlay2016-09-071-0/+2
| * | | | LintedDan Finlay2016-09-071-23/+22
| * | | | Add fiat balances to tx conf viewDan Finlay2016-09-072-9/+7
| * | | | Add fiat conversion to pending tx development stateDan Finlay2016-09-072-2/+94
| * | | | Got basic fiat display modularizedDan Finlay2016-09-073-22/+26
| * | | | Fix fiat-valueDan Finlay2016-09-071-1/+0
| * | | | Nearly finished factoring fiat value into eth-balanceDan Finlay2016-09-079-109/+19
| * | | | Merge branch 'master' into ModularFiatBalanceDan Finlay2016-09-078-28/+187
| |\ \ \ \
| * | | | | Continuing fiat balance modularizationDan Finlay2016-09-043-73/+106
| | | | * | Remove npm i again because apparently that workedDan Finlay2016-09-091-1/+0
| | | | * | Remove deps added for older ubuntuDan Finlay2016-09-091-6/+1
| | | | * | Remove npm i to check if cache heldDan Finlay2016-09-091-1/+0
| | | | * | Try adding npm i to circle.ymlDan Finlay2016-09-091-0/+1
| | | | * | Fix logo usage for metamask-logo v2.0.0Dan Finlay2016-09-092-15/+4
| | | | * | Update locked stateDan Finlay2016-09-092-63/+23
| |_|_|/ / |/| | | |
* | | | | Merge pull request #619 from johnweldon/masterDan Finlay2016-09-081-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix typoJohn Weldon2016-09-081-1/+1
|/ / / /
* | | | Merge pull request #618 from MetaMask/RollbackLeakFixKevin Serrano2016-09-071-1/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Reverting memory leak fixDan Finlay2016-09-071-1/+0
|/ / /
* | | Merge pull request #617 from MetaMask/i616-FixListenerLeakKevin Serrano2016-09-073-1/+3
|\ \ \
| * | | Bump changelogDan Finlay2016-09-072-25/+1
| * | | Ensure listener is cleaned upDan Finlay2016-09-073-1/+27
|/ / /
* | | Merge pull request #612 from MetaMask/first-timeDan Finlay2016-09-075-7/+14
|\ \ \ | |_|/ |/| |
| * | Update changelog and merge master.Kevin Serrano2016-09-071-0/+1
| * | Merge branch 'master' into first-timeKevin Serrano2016-09-072-0/+107
| |\ \ | |/ / |/| |
* | | Merge pull request #614 from MetaMask/i546-NegativeErrKevin Serrano2016-09-072-0/+107
|\ \ \
| * | | Add negative value validation to tx approvalDan Finlay2016-09-072-0/+107
|/ / /
| * | Fix capitalization.Kevin Serrano2016-09-071-1/+1
| * | Replace chrome with generalized browser API.Kevin Serrano2016-09-071-2/+2
| * | Add to changelog.Kevin Serrano2016-09-071-0/+2
| * | Redirect to video in a new tab on fresh install.Kevin Serrano2016-09-071-1/+6
| * | Fix typos and refine wording.Kevin Serrano2016-09-072-5/+4
|/ /
* | Merge pull request #611 from vincentserpoul/patch-1Kevin Serrano2016-09-061-2/+3
|\ \
| * | lintingVincent Serpoul2016-09-061-1/+1
| * | Error message more helpfulVincent Serpoul2016-09-061-2/+3
|/ /
* | Merge pull request #609 from MetaMask/livereloadkumavis2016-09-043-7/+45
|\ \
| * | Fix boolean.Kevin Serrano2016-09-031-1/+1
| * | Merge branch 'master' into livereloadKevin Serrano2016-09-032-1/+5
| |\ \ | |/ / |/| |
* | | Merge pull request #608 from MetaMask/2.10.2Kevin Serrano2016-09-032-1/+5
|\ \ \
| * | | Version 2.10.2kumavis2016-09-032-1/+5
|/ / /
| * | Merge branch 'master' into livereloadKevin Serrano2016-09-033-19/+28
| |\ \ | |/ / |/| |
* | | Merge pull request #607 from MetaMask/notif-fix2.10.2Kevin Serrano2016-09-031-18/+24
|\ \ \
| * \ \ Merge branch 'master' into notif-fixKevin Serrano2016-09-030-0/+0
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #606 from MetaMask/2.10.12.10.1kumavis2016-09-032-1/+4
|\ \ \ \ | |_|_|/ |/| | |
| | * | notif - use standard err-first callback stylekumavis2016-09-031-18/+24
| |/ /
| * / Version 2.10.1kumavis2016-09-032-1/+4
|/ /
| * Changelog add.Kevin Serrano2016-09-031-1/+1
| * Changelog add and rename vars.Kevin Serrano2016-09-032-6/+7
| * Refactor for spreading. Add conditionals for livereload.Kevin Serrano2016-09-031-6/+24
| * Add production flag. Conditionally copy reload based on production.Kevin Serrano2016-09-021-1/+16
| * Install deps. Fix chrome/firefox typo.Kevin Serrano2016-09-022-3/+7
|/
* Merge pull request #603 from MetaMask/i566-NoPopupWhenOpenKevin Serrano2016-09-024-14/+21
|\
| * Merge branch 'master' into i566-NoPopupWhenOpenDan Finlay2016-09-021-4/+18
| |\ | |/ |/|
* | Merge pull request #601 from MetaMask/filterfixDan Finlay2016-09-011-4/+18
|\ \
| * | inpage - remap ids on responsekumavis2016-09-011-4/+18
|/ /
| * Bump changelogDan Finlay2016-09-021-0/+1
| * LintedDan Finlay2016-09-021-1/+1
| * Show conf screen after send requestDan Finlay2016-09-021-2/+1
| * Skip loading indication from send screenDan Finlay2016-09-021-1/+0
| * Do not open popup for internally produced txsDan Finlay2016-09-021-11/+19
|/
* Merge pull request #600 from MetaMask/i597-ModifyInfuraUrlsDan Finlay2016-09-011-2/+2
|\
| * Add metamask route to infura urlsDan Finlay2016-09-011-2/+2
|/
* Merge pull request #596 from MetaMask/EdgeCompatibilitykumavis2016-08-309-28/+76
|\
| * Make element enumeration Edge compatibleDan Finlay2016-08-301-10/+7
| * Add test for Edge compatibilityDan Finlay2016-08-301-0/+29
| * Remove old notification cleanup codeDan Finlay2016-08-301-10/+0
| * Make popup a type Edge supportsDan Finlay2016-08-301-1/+2
| * Add extra edge compatibilityDan Finlay2016-08-301-2/+13
| * Fix console.error referencesDan Finlay2016-08-301-3/+3
| * Remove bind calls from console errorsDan Finlay2016-08-301-4/+4
| * Add tolerance for failed form persistingDan Finlay2016-08-301-0/+7
| * Merge branch 'master' into EdgeCompatibilityDan Finlay2016-08-3076-491/+3768
| |\ | |/ |/|
* | Merge pull request #594 from MetaMask/i541-CustomMenuItemFixkumavis2016-08-304-8/+13
|\ \
| * | Bump changelogDan Finlay2016-08-301-0/+2
| * | Show custom rpc menu item alwaysDan Finlay2016-08-301-6/+9
| * | Make custom network dev state not loadingDan Finlay2016-08-302-2/+2
|/ /
* | Merge pull request #593 from MetaMask/Version-2.10.02.10.0Dan Finlay2016-08-302-4/+5
|\ \
| * | Version 2.10.0Dan Finlay2016-08-302-4/+5
|/ /
* | Merge pull request #591 from MetaMask/SpellingFixDan Finlay2016-08-271-1/+1
|\ \
| * | Fix spelling errorDan Finlay2016-08-271-1/+1
|/ /
* | Merge pull request #588 from MetaMask/i#563forgotPasswordDan Finlay2016-08-278-44/+177
|\ \
| * | make the back button its own functionFrankie2016-08-271-21/+22
| * | Merge branch 'master' into i#563forgotPasswordFrankie2016-08-2620-196/+699
| |\ \ | |/ / |/| |
* | | Merge pull request #554 from MetaMask/PopupNotificationskumavis2016-08-2611-183/+108
|\ \ \
| * \ \ Merge branch 'master' into PopupNotificationsDan Finlay2016-08-2613-18/+607
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #590 from MetaMask/i432PersistFormStatekumavis2016-08-2610-13/+591
|\ \ \ \
| * \ \ \ Merge branch 'master' into i432PersistFormStateDan Finlay2016-08-262-1/+7
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | Bump changelogDan Finlay2016-08-261-1/+2
| * | | | LintedDan Finlay2016-08-261-3/+1
| * | | | Persist shapeshift form input valuesDan Finlay2016-08-261-3/+12
| * | | | Add shapeshift development stateDan Finlay2016-08-262-1/+349
| * | | | Persist send tx form field valuesDan Finlay2016-08-261-5/+14
| * | | | Remove logDan Finlay2016-08-261-1/+0
| * | | | Add send form development stateDan Finlay2016-08-262-1/+77
| * | | | Update persistient-form docsDan Finlay2016-08-261-18/+11
| * | | | Make restore vault form persistDan Finlay2016-08-261-3/+14
| * | | | Add restore vault development stateDan Finlay2016-08-262-1/+40
| * | | | Add persistent form classDan Finlay2016-08-262-1/+82
| * | | | Noted initial thoughtsDan Finlay2016-08-261-0/+14
| | * | | Merge branch 'master' into PopupNotificationsDan Finlay2016-08-2510-12/+433
| | |\ \ \
| | * \ \ \ Merge branch 'master' into PopupNotificationsDan Finlay2016-08-252-0/+11
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into PopupNotificationsDan Finlay2016-08-245-9/+17
| | |\ \ \ \ \
| | * | | | | | LintedDan Finlay2016-08-241-1/+0
| | * | | | | | Close notification on opening main UIDan Finlay2016-08-243-9/+17
| | * | | | | | Skip popup dismissal in testsDan Finlay2016-08-241-0/+6
| | * | | | | | LintedDan Finlay2016-08-241-1/+0
| | * | | | | | Close popup even if last tx is dismissed from main UIDan Finlay2016-08-242-15/+22
| | * | | | | | Emit updates to all listeners on pending tx updatesDan Finlay2016-08-243-53/+23
| | * | | | | | Merge branch 'master' into PopupNotificationsDan Finlay2016-08-2314-18/+156
| | |\ \ \ \ \ \
| | * | | | | | | Fix back button hiding on popupDan Finlay2016-08-231-1/+2
| | * | | | | | | Merge branch 'master' into PopupNotificationsDan Finlay2016-08-233-0/+30
| | |\ \ \ \ \ \ \
| | * | | | | | | | Limit to one popup, re-focus on additional notifications.Dan Finlay2016-08-231-6/+17
| | * | | | | | | | Merge masterDan Finlay2016-08-231-1/+2
| | * | | | | | | | Merge branch 'master' into PopupNotificationsDan Finlay2016-08-2322-38/+552
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Bump changelogDan Finlay2016-08-171-0/+1
| | * | | | | | | | | LintedDan Finlay2016-08-172-22/+9
| | * | | | | | | | | MVP Popup Notifications WorkingDan Finlay2016-08-176-89/+23
| | * | | | | | | | | Unify notification and popup ui filesDan Finlay2016-08-177-58/+29
| | * | | | | | | | | Merge branch 'master' into PopupNotificationsDan Finlay2016-08-1721-13/+390
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Set up MVP for popup-based notifications.Dan Finlay2016-08-176-130/+161
| | | | | | | | | | * | Change style on back button to be more like the rest of the appFrankie2016-08-261-25/+55
| | | | | | | | | | * | Add - "npm i -g mocha" to circleFrankie2016-08-261-0/+1
| | | | | | | | | | * | Merge branch 'master' into i#563forgotPasswordFrankie2016-08-2627-40/+659
| | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #587 from MetaMask/kuma-fixKevin Serrano2016-08-262-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge pull request #586 from MetaMask/kumavis-patch-2kumavis2016-08-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | CI - add lsb-base depkumavis2016-08-261-1/+1
| |/ / / / / / / / / / /
| * | | | | | | | | | | add deps.Kevin Serrano2016-08-261-0/+1
| * | | | | | | | | | | Bump chrome version.Kevin Serrano2016-08-261-1/+1
| * | | | | | | | | | | Modify cirlce.ymlKevin Serrano2016-08-261-0/+5
| * | | | | | | | | | | Testing bump for web3 provider engineKevin Serrano2016-08-261-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #584 from MetaMask/shortcut-fixKevin Serrano2016-08-252-5/+10
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | 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.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
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into i484PersistPendingSignaturesDan Finlay2016-08-259-11/+439
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #579 from MetaMask/api-test-fixDan Finlay2016-08-254-3/+16
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into api-test-fixKevin Serrano2016-08-255-8/+412
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #580 from MetaMask/FixEmptySignBugKevin Serrano2016-08-255-8/+412
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | 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
|/ / / / / / / /
* | | | | | | | Merge pull request #574 from MetaMask/fox-subDan Finlay2016-08-245-9/+17
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | 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
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into kumavis-patch-1kumavis2016-08-2312-15/+128
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #558 from MetaMask/i390-TransactionLimitkumavis2016-08-2312-15/+128
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ 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
| * | | | | | | | | 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
| * | | | | | | | | | Enforce tx history limitDan Finlay2016-08-192-0/+17
| | |_|_|_|_|/ / / / | |/| | | | | | | |
| | | | * | | | | | inpage - cleanContextForImports fixkumavis2016-08-231-1/+1
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #572 from MetaMask/i479kumavis2016-08-231-2/+28
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Merge branch 'master' into i479kumavis2016-08-233-0/+30
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #571 from MetaMask/chinese-localDan Finlay2016-08-233-0/+30
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | 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
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | |
| | | * | | | Modify logic for component update.Kevin Serrano2016-08-201-5/+4
| | | * | | | Create replacement logo for non-webglKevin Serrano2016-08-202-3/+10
| | | | | * | Add to CHANGELOGFrankie2016-08-261-1/+5
| | | | | * | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 05:20:24 +0800