aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix etherscan link generation testDan Finlay2016-11-231-2/+8
* Merge branch 'dev' into i842-WaitForSeedWordDan Finlay2016-11-238-46/+67
|\
| * Merge pull request #866 from MetaMask/new-faucet-devDan Finlay2016-11-233-3/+4
| |\
| | * Make ropsten faucet button point at the correct url.Kevin Serrano2016-11-233-3/+4
| * | Merge pull request #856 from MetaMask/i835-OrganizeKeyringsKevin Serrano2016-11-236-45/+65
| |\ \
| | * | Fix keyring testDan Finlay2016-11-221-1/+1
| | * | Improve Keyring organizationDan Finlay2016-11-225-42/+62
* | | | Use callback in placeSeedWord method.Dan Finlay2016-11-222-3/+10
| |/ / |/| |
* | | Revert premature link test fixDan Finlay2016-11-221-2/+2
|/ /
* / Fixed account link test for ropsten networkDan Finlay2016-11-221-2/+2
|/
* Merge pull request #837 from MetaMask/FixMenuItemKevin Serrano2016-11-224-8/+96
|\
| * Add development states.js back into repoDan Finlay2016-11-222-1/+1
| * Fix custom provider menu itemDan Finlay2016-11-225-8/+96
* | Merge pull request #833 from MetaMask/i831-AddRopsten-DevKevin Serrano2016-11-228-4/+41
|\ \
| * | Merge branch 'dev' into i831-AddRopsten-DevDan Finlay2016-11-22100-814/+8243
| |\|
| * | Begin adding Ropsten supportDan Finlay2016-11-228-4/+42
* | | Merge pull request #830 from MetaMask/kumavis-patch-1Dan Finlay2016-11-221-1/+8
|\ \ \ | |_|/ |/| |
| * | meta - README - add npm start to instructionskumavis2016-11-221-1/+8
|/ /
* | Merge pull request #827 from MetaMask/currency-cleanupDan Finlay2016-11-194-7/+5731
|\ \
| * | Convert conversion util to pure json.Kevin Serrano2016-11-194-7/+5731
* | | Merge pull request #826 from MetaMask/mini-lintDan Finlay2016-11-192-3/+3
|\ \ \ | |/ / |/| |
| * | Maintain linting.Kevin Serrano2016-11-192-3/+3
|/ /
* | Merge pull request #824 from MetaMask/failing-testsDan Finlay2016-11-193-5/+72
|\ \
| * | Promisify persistence of keyrings before returning keyKevin Serrano2016-11-191-5/+5
| * | Merge branch 'dev' into failing-testsKevin Serrano2016-11-192-3/+3
| |\ \ | |/ / |/| |
* | | Merge pull request #823 from MetaMask/FixBorkKevin Serrano2016-11-191-2/+2
|\ \ \
| * | | Update migration code for new hd wallet param nameDan Finlay2016-11-191-2/+2
|/ / /
* | | Persist keyrings from migration to storage.Kevin Serrano2016-11-191-1/+1
| * | Create failing test to check submitPassword in keyringController.Kevin Serrano2016-11-192-0/+67
|/ /
* | Resolve merge conflict.Kevin Serrano2016-11-1994-805/+2444
|\ \ | |/ |/|
| * random-id - use Number.MAX_SAFE_INTEGER as maxkumavis2016-11-181-1/+1
| * Merge pull request #816 from MetaMask/i328-MultiVaultkumavis2016-11-1895-818/+2457
| |\
| | * Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3...Dan Finlay2016-11-1866-306/+273
| | |\
| | | * Revert one cb to previous state.Kevin Serrano2016-11-162-2/+2
| | | * Minimize dispatches by using emitters and relying on state updates.Kevin Serrano2016-11-162-26/+12
| | | * Fix semantics in commentsKevin Serrano2016-11-161-1/+1
| | | * Lints.Kevin Serrano2016-11-161-1/+1
| | | * Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3...Kevin Serrano2016-11-160-0/+0
| | | |\
| | | | * Resolve merge conflicts.Kevin Serrano2016-11-163-5/+5
| | | | |\
| | | * | \ Resolve merge conflicts.Kevin Serrano2016-11-163-5/+5
| | | |\ \ \ | | | | |/ / | | | |/| / | | | | |/
| | | * | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3...Kevin Serrano2016-11-161-0/+2
| | | |\ \
| | | | * | Minimize repeated code.Kevin Serrano2016-11-161-5/+6
| | | * | | Minimize repeated code.Kevin Serrano2016-11-162-8/+7
| | | |/ /
| | | * | Re-enable disclaimer screen. Rename variables to reflect role more clearly.Kevin Serrano2016-11-1530-49/+49
| | | * | Add idStore tests again.Kevin Serrano2016-11-151-0/+198
| | | * | Rename n variables to numberOfAccounts inside of test suite. Remove idStore t...Kevin Serrano2016-11-123-203/+4
| | | * | Revert to previous anonymous function for promise.Kevin Serrano2016-11-121-1/+3
| | | * | Various keyring changesKevin Serrano2016-11-121-18/+10
| | | * | Clarify functions names. Package normalize inside util file. Fix require head...Kevin Serrano2016-11-121-11/+8
| | | * | Package normalize inside sig util file.Kevin Serrano2016-11-121-0/+5
| | | * | Fix lint rules for ternary operator placement.Kevin Serrano2016-11-122-19/+19
| | | * | Typo fix.Kevin Serrano2016-11-121-9/+9
| | | * | Linting to the max.Kevin Serrano2016-11-1232-177/+129
| | | * | Merge branch 'master' into i328-MultiVaultkumavis2016-11-112-2/+6
| | | |\ \ | | |_|/ / | |/| | |
| | | * | Merge branch 'master' into i328-MultiVaultkumavis2016-11-113-2/+26
| | | |\ \
| | | * \ \ Merge pull request #802 from MetaMask/confTxFixKevin Serrano2016-11-119-28/+33
| | | |\ \ \
| | | | * | | fix tx data so it has the network idFrankie2016-11-112-2/+9
| | | | * | | Merge branch 'master' into i328-MultiVaultFrankie2016-11-118-26/+24
| | | |/| | |
| | * | | | | Replace old random-id code with incrementing id generatorDan Finlay2016-11-183-11/+12
| | |/ / / /
| | * | | | Merge branch 'master' into i328-MultiVaultDan Finlay2016-11-084-17/+48
| | |\ \ \ \
| | * | | | | Fix integration test suiteDan Finlay2016-11-083-13/+5
| | * | | | | Fix nickname testDan Finlay2016-11-081-0/+1
| | * | | | | Fix BN referenceDan Finlay2016-11-081-0/+1
| | * | | | | Fix 787 gas buffer bugDan Finlay2016-11-082-9/+25
| | * | | | | Fix network checkingDan Finlay2016-11-051-21/+1
| | * | | | | Remove insane actions hashDan Finlay2016-11-051-6/+2
| | * | | | | Add tolerance to normalize methodDan Finlay2016-11-041-0/+1
| | * | | | | Fix password validation and persistence issueDan Finlay2016-11-043-4/+30
| | * | | | | Implement private key exporting.Kevin Serrano2016-11-042-3/+22
| | * | | | | Finish fixing nicknaming bugDan Finlay2016-11-042-28/+70
| | * | | | | Fix account nicknaming bugDan Finlay2016-11-043-3/+19
| | * | | | | Fix vault creation bugDan Finlay2016-11-042-25/+41
| | * | | | | Set test env during testsDan Finlay2016-11-041-1/+1
| | * | | | | Don't faucet during testsDan Finlay2016-11-041-1/+2
| | * | | | | Don't faucet in developmentDan Finlay2016-11-041-1/+3
| | * | | | | Fix dual vault creation bugDan Finlay2016-11-032-12/+16
| | * | | | | Fix initial vault creationDan Finlay2016-11-031-4/+8
| | * | | | | Fix handling of migrating old vault styleDan Finlay2016-11-035-56/+114
| | * | | | | Add reveal of seed words.Kevin Serrano2016-11-025-2/+52
| | * | | | | Make identicon tolerant of changing stateDan Finlay2016-11-021-0/+17
| | * | | | | Fixed bugs related to clearing caches when restoring to a new vaultDan Finlay2016-11-026-13/+54
| | * | | | | Make forgot password button.Dan Finlay2016-11-023-32/+23
| | * | | | | Remove and untrack npm debug filesDan Finlay2016-11-022-46/+1
| | * | | | | Fix seed phrase restoreDan Finlay2016-11-023-5/+4
| | * | | | | Made progress on parity for MultiVaultKevin Serrano2016-11-0210-199/+103
| | * | | | | Do not open MM page in dev mode.Kevin Serrano2016-11-021-1/+2
| | * | | | | LintedKevin Serrano2016-11-012-1/+46
| | * | | | | Implement seed word confirmation page.Kevin Serrano2016-11-019-12/+53
| | * | | | | Implement auto-faucetingKevin Serrano2016-11-011-1/+6
| | * | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3...Kevin Serrano2016-10-315-16/+142
| | |\ \ \ \ \
| | | * | | | | Now migrating old vaults to new DEN formatDan Finlay2016-10-295-16/+142
| | * | | | | | Make case condition more consistent. Remove extra action. Fix incorrect displ...Kevin Serrano2016-10-312-2/+3
| | * | | | | | Add focus to password field.Kevin Serrano2016-10-311-0/+4
| | * | | | | | Add password warning div.Kevin Serrano2016-10-311-2/+7
| | * | | | | | Modify first-screen design to match docs.Kevin Serrano2016-10-311-2/+3
| | * | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3...Kevin Serrano2016-10-2913-30/+465
| | |\| | | | |
| | | * | | | | Add vault migration testDan Finlay2016-10-291-0/+91
| | | * | | | | Configure BIP44 Keychain as default oneDan Finlay2016-10-294-11/+44
| | | * | | | | Added hd wallet testsDan Finlay2016-10-282-4/+109
| | | * | | | | Add hd wallet keyringDan Finlay2016-10-282-0/+79
| | | * | | | | Fix identicon renderingDan Finlay2016-10-281-7/+6
| | | * | | | | Update first screen to match design.Dan Finlay2016-10-282-10/+99
| | | * | | | | Add latest jazzicon versionDan Finlay2016-10-281-1/+1
| | | * | | | | Add first-time stateDan Finlay2016-10-282-1/+40
| | | * | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3...Dan Finlay2016-10-2620-205/+7
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-264-14/+35
| | | |\ \ \ \ \ \
| | * | \ \ \ \ \ \ Merge branch 'master' into i328-MultiVaultKevin Serrano2016-10-2912-42/+76
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Remove debugger statement.Kevin Serrano2016-10-261-1/+0
| | * | | | | | | | Phase out extra warning screen.Kevin Serrano2016-10-2620-205/+8
| | * | | | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3...Kevin Serrano2016-10-2415-87/+712
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-224-1/+36
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Fix duplicate provider menu item bugDan Finlay2016-10-221-6/+1
| | | * | | | | | | | Fix loading indicationDan Finlay2016-10-221-1/+1
| | | * | | | | | | | Added tx & msg managing functionality to new KeyringControllerDan Finlay2016-10-222-1/+150
| | | * | | | | | | | Fix bug in new KeyringController vault restoring logic.Dan Finlay2016-10-223-3/+74
| | | * | | | | | | | Create new vault before each keyringController unit testDan Finlay2016-10-221-3/+5
| | | * | | | | | | | Create basic keyring-controller unit test fileDan Finlay2016-10-224-32/+83
| | | * | | | | | | | Added SimpleKeyring testsDan Finlay2016-10-224-18/+110
| | | * | | | | | | | Added tx and msg signing to keychain & controllerDan Finlay2016-10-214-39/+134
| | | * | | | | | | | Improved simple account generationDan Finlay2016-10-213-35/+52
| | | * | | | | | | | Began adding first basic keyringDan Finlay2016-10-218-13/+166
| | | * | | | | | | | Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-211-1/+1
| | | |\ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ Merge branch 'master' into i328-MultiVaultKevin Serrano2016-10-244-1/+36
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge branch 'master' into i328-MultiVaultKevin Serrano2016-10-211-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | / / / / / / / | | | | |/ / / / / / / | | | |/| | | | | | |
| | * | | | | | | | | Fix background connection referencesDan Finlay2016-10-212-2/+2
| | * | | | | | | | | Fix testsDan Finlay2016-10-217-179/+16
| | * | | | | | | | | Linted & added salting to vaultDan Finlay2016-10-217-44/+31
| | * | | | | | | | | Fix state updating after vault creation and unlockingDan Finlay2016-10-213-4/+11
| | * | | | | | | | | Fix unlock logicDan Finlay2016-10-211-6/+17
| | * | | | | | | | | Commented out useless advanced not on init screenDan Finlay2016-10-211-0/+2
| | * | | | | | | | | Change actions reference to keyringController to backgroundDan Finlay2016-10-212-25/+25
| | * | | | | | | | | LintedDan Finlay2016-10-211-1/+1
| | * | | | | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3...Dan Finlay2016-10-2127-120/+483
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Resolve merge conflict.Kevin Serrano2016-10-200-0/+0
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Git merge resolution.Kevin Serrano2016-10-2014-45/+267
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Intermediary commit.Kevin Serrano2016-10-209-37/+77
| | | * | | | | | | | | | | Remove unused crypto dependencies.Kevin Serrano2016-10-202-4/+0
| | | * | | | | | | | | | | Add crypto packages to package.jsonKevin Serrano2016-10-201-0/+2
| | | * | | | | | | | | | | Merge in crypto.Kevin Serrano2016-10-209-5/+195
| | | * | | | | | | | | | | Initial work on UI sideKevin Serrano2016-10-166-1/+82
| | | * | | | | | | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into or...Kevin Serrano2016-10-1311-144/+467
| | | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Add debug flag to dev modeDan Finlay2016-10-201-2/+2
| | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | LintedDan Finlay2016-10-152-10/+5
| | * | | | | | | | | | | | Fixed vector usage in encryptorDan Finlay2016-10-151-3/+17
| | * | | | | | | | | | | | Got basic encryptor workingDan Finlay2016-10-152-14/+61
| | * | | | | | | | | | | | Got encrypting working, not yet decryptingDan Finlay2016-10-155-115/+51
| | * | | | | | | | | | | | Began adding browser-native encryptor moduleDan Finlay2016-10-138-3/+201
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Add minimal method signatures to new keyring controllerDan Finlay2016-10-133-15/+94
| | * | | | | | | | | | | Remove additional deprecated actionDan Finlay2016-10-131-15/+0
| | * | | | | | | | | | | Remove opinionated seed word codeDan Finlay2016-10-137-116/+4
| | * | | | | | | | | | | Merge branch 'master' into i328-MultiVaultDan Finlay2016-10-1316-83/+365
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Add initial KeyringController filesDan Finlay2016-10-122-0/+183
| | * | | | | | | | | | | | Add to docDan Finlay2016-10-121-0/+13
| | * | | | | | | | | | | | Add multi-vault planning docDan Finlay2016-10-081-0/+175
* | | | | | | | | | | | | | Merge pull request #819 from MetaMask/i791-FixLosingConnectionkumavis2016-11-184-11/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Increment tx ids to avoid collisionsDan Finlay2016-11-184-11/+13
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #814 from MetaMask/Version-2.13.8kumavis2016-11-172-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Version 2.13.82.13.8Dan Finlay2016-11-172-2/+5
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #811 from MetaMask/deadly-fixkumavis2016-11-153-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'deadly-fix' of github.com:MetaMask/metamask-plugin into deadly-fixKevin Serrano2016-11-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | First attempt at fixing errors in confirmation screen.Kevin Serrano2016-11-152-4/+3
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add to changelog.Kevin Serrano2016-11-151-0/+1
| * | | | | | | | | | | | First attempt at fixing errors in confirmation screen.Kevin Serrano2016-11-152-4/+3
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #807 from MetaMask/cssIsAwesomekumavis2016-11-112-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | lint fixFrankie2016-11-111-1/+2
| * | | | | | | | | | | Fix funny looking errors in conf-txFrankie2016-11-112-2/+5
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #805 from MetaMask/i804kumavis2016-11-113-2/+26
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | changelog - updatekumavis2016-11-111-0/+1
| * | | | | | | | | | detect tx error - show warning and fix gasLimitkumavis2016-11-112-2/+25
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #801 from MetaMask/deadlyKevin Serrano2016-11-106-18/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | remove gas field, due to alias redundancy.Kevin Serrano2016-11-101-1/+0
| * | | | | | | | | | Fix bug for increasing gas by 20 percent.Kevin Serrano2016-11-103-1/+3
| * | | | | | | | | | Merge branch 'deadly' of github.com:MetaMask/metamask-plugin into deadlyKevin Serrano2016-11-103-17/+12
|/| | | | | | | | | |
| * | | | | | | | | | Unify warning functions.Kevin G. Serrano2016-11-083-17/+12
* | | | | | | | | | | Merge pull request #797 from MetaMask/Version-2.13.7Frankie2016-11-093-2/+4
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Hard coding jazzicon at working version2.13.7Dan Finlay2016-11-091-1/+1
| * | | | | | | | | | | Version 2.13.7Dan Finlay2016-11-092-1/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #796 from MetaMask/IncreaseGasBufferDan Finlay2016-11-093-8/+8
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Adjust gas buffer to be 20% over estimateDan Finlay2016-11-093-7/+7
| * | | | | | | | | | Increase gas bufferDan Finlay2016-11-093-4/+4
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #793 from MetaMask/i787-HighGasBugKevin Serrano2016-11-083-16/+45
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix gas price bufferingDan Finlay2016-11-083-13/+12
| * | | | | | | | | Added failing test for #787Dan Finlay2016-11-081-11/+41
|/ / / / / / / / /
* | | | | | | | | Merge pull request #786 from MetaMask/i763-GithubLinkkumavis2016-11-012-1/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Fix github link on info pageDan Finlay2016-11-012-1/+3
|/ / / / / / / /
* | | | | | | | Merge pull request #778 from MetaMask/mascara-buildkumavis2016-10-273-11/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | mascara - remove global transpilekumavis2016-10-272-10/+0
| * | | | | | | | mascara - example dapp - log main accountkumavis2016-10-271-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #774 from MetaMask/walkThroughDan Finlay2016-10-272-4/+21
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into walkThroughFrankie2016-10-272-1/+2
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #767 from MetaMask/UpdateWeb3kumavis2016-10-272-1/+2
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into UpdateWeb3Dan Finlay2016-10-272-1/+3
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'master' into UpdateWeb3Dan Finlay2016-10-274-12/+15
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | deps - web3 - set version to 0.17.0-betakumavis2016-10-271-1/+1
| * | | | | | | | | | Update web3.js versionDan Finlay2016-10-262-1/+2
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | | * | | | | | | Fix typos and clean upFrankie2016-10-272-2/+1
| | | * | | | | | | Merge branch 'master' into walkThroughFrankie2016-10-275-11/+15
| | | |\ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #773 from MetaMask/Version-2.13.62.13.6Dan Finlay2016-10-272-1/+3
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Version 2.13.6Dan Finlay2016-10-272-1/+3
|/ / / / / / / / /
* | | | | | | | | Merge pull request #768 from MetaMask/i762-RenameWalletToAccountDan Finlay2016-10-272-1/+2
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into i762-RenameWalletToAccountDan Finlay2016-10-273-9/+10
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #764 from MetaMask/761-FixCustomMordenIndicationKevin Serrano2016-10-273-9/+10
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into 761-FixCustomMordenIndicationDan Finlay2016-10-272-2/+3
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Bump changelogDan Finlay2016-10-261-0/+2
| * | | | | | | | | | Fix provider menu selection indicationDan Finlay2016-10-262-9/+8
| | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Merge branch 'master' into i762-RenameWalletToAccountDan Finlay2016-10-272-2/+3
| | |\ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| | * | | | | | | | Rename wallet to accountDan Finlay2016-10-262-1/+2
| |/ / / / / / / /
| | * | | | | | | Fix the size of the pop-upFrankie2016-10-271-3/+3
| | * | | | | | | Add more info about first useFrankie2016-10-271-1/+19
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #769 from MetaMask/FixDelegateCallDan Finlay2016-10-261-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix delegate call function reference 2Dan Finlay2016-10-261-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #766 from MetaMask/FixDelegateCallCheckDan Finlay2016-10-262-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix delegate call analysisDan Finlay2016-10-262-1/+2
|/ / / / / / /
* | | | | | | Merge pull request #745 from MetaMask/i743-FixDelegateCallFlagkumavis2016-10-254-14/+35
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | test - fix delegate-call testkumavis2016-10-254-12/+10
| * | | | | | Merge branch 'master' into i743-FixDelegateCallFlagkumavis2016-10-255-2/+37
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #752 from MetaMask/i#741Dan Finlay2016-10-224-1/+36
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Change regex in isHex functionFrankie2016-10-221-4/+1
| * | | | | | Merge branch 'i#741' of https://github.com/MetaMask/metamask-plugin into i#741Frankie2016-10-221-1/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into i#741Frankie2016-10-211-1/+1
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #751 from MetaMask/ClarifyCallbackRoleFrankie2016-10-211-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Add note about callback param to sync method warningDan Finlay2016-10-201-1/+1
|/ / / / / / /
| * / / / / / clean up the isHex functionFrankie2016-10-221-3/+4
| |/ / / / /
| * | | | | Clean up testsFrankie2016-10-211-4/+4
| * | | | | Add test and ability for isHex to handle hex strings with hex-prefixFrankie2016-10-202-0/+6
| * | | | | Fix up wordingFrankie2016-10-201-1/+1
| * | | | | Fix CHANGELOGFrankie2016-10-201-0/+1
| * | | | | Merge branch 'master' into i#741Frankie2016-10-204-3/+7
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add unit test for isHex and add to CHANGELOG.mdFrankie2016-10-202-0/+18
| * | | | | Add valdations to txData paramFrankie2016-10-202-0/+12
| | * | | | Merge branch 'master' into i743-FixDelegateCallFlagKevin Serrano2016-10-194-3/+7
| | |\ \ \ \ | |_|/ / / / |/| | | | |
* | | | | | Merge pull request #749 from MetaMask/Version-2.13.5Kevin Serrano2016-10-193-2/+4
|\ \ \ \ \ \
| * | | | | | Fix changelog dateDan Finlay2016-10-191-1/+1
| * | | | | | Fix cli flag capitalizationDan Finlay2016-10-191-1/+1
| * | | | | | Version 2.13.5v2.13.5Dan Finlay2016-10-192-1/+3
| * | | | | | Remove livereload from prod buildsDan Finlay2016-10-191-1/+1
|/ / / / / /
* | | | | | Merge pull request #748 from MetaMask/i746-ReloadBugkumavis2016-10-192-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Wait for first metamask data to establish ping-pong stream.Dan Finlay2016-10-192-1/+3
|/ / / / /
| * / / / Reproduced issue 743 in test caseDan Finlay2016-10-183-12/+35
|/ / / /
* | | | Merge pull request #744 from MetaMask/i738-IncreaseGaskumavis2016-10-183-1/+29
|\ \ \ \
| * | | | Restore hex prefix to gas priceDan Finlay2016-10-182-1/+2
| * | | | Increase gas estimate by 100000 weiDan Finlay2016-10-183-1/+28
|/ / / /
* | | | Merge pull request #737 from MetaMask/Version-2.13.4Kevin Serrano2016-10-183-2/+5
|\ \ \ \
| * | | | Version 2.13.4Dan Finlay2016-10-183-2/+5
|/ / / /
* | | | Merge pull request #736 from MetaMask/i735-xmlfixDan Finlay2016-10-182-2/+15
|\ \ \ \
| * \ \ \ Merge branch 'master' into i735-xmlfixKevin Serrano2016-10-189-38/+213
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #720 from MetaMask/i#495CustomGasFieldkumavis2016-10-179-38/+214
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix for lintingFrankie2016-10-141-1/+1
| * | | | Create callback and Clean-up detailsFrankie2016-10-144-12/+19
| * | | | fix spellingFrankie2016-10-141-4/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 14:40:24 +0800