aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | 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
| | |/ / / / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-13 04:16:52 +0800