Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-06-07 | 30 | -85/+300 |
|\ | | | | | | | network-remove-provider-engine | ||||
| * | Merge pull request #4512 from MetaMask/test-metamask-no-diagnostics | Thomas Huang | 2018-06-07 | 1 | -0/+3 |
| |\ | | | | | | | test - metamask-controller - disable diagnostics | ||||
| | * | test - metamask-controller - disable diagnostics | kumavis | 2018-06-06 | 1 | -0/+3 |
| | | | |||||
| * | | Merge pull request #4414 from scsaba/recipient-blacklist | kumavis | 2018-06-07 | 5 | -1/+137 |
| |\ \ | | | | | | | | | Disallow sending to ganache default accounts on main net | ||||
| | * | | remove generating blocked accounts and use a config file instead | Csaba Solya | 2018-05-31 | 4 | -29/+30 |
| | | | | |||||
| | * | | fix documentation | Csaba Solya | 2018-05-30 | 1 | -1/+1 |
| | | | | |||||
| | * | | adding tests for recipient blacklist checker | Csaba Solya | 2018-05-30 | 3 | -5/+83 |
| | | | | |||||
| | * | | adding transaction controller tests | Csaba Solya | 2018-05-30 | 2 | -1/+18 |
| | | | | |||||
| | * | | initial implementation | Csaba Solya | 2018-05-30 | 2 | -1/+41 |
| | | | | |||||
| * | | | Merge pull request #4418 from MetaMask/handle-import-account-failure-in-ui | kumavis | 2018-06-07 | 4 | -19/+47 |
| |\ \ \ | | | | | | | | | | | Handle errors for null selected address after Importing account (json or private key) | ||||
| | * \ \ | Merge branch 'develop' into handle-import-account-failure-in-ui | Dan | 2018-06-05 | 23 | -60/+366 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'develop' into handle-import-account-failure-in-ui | Dan | 2018-06-03 | 47 | -282/+458 |
| | |\ \ \ \ | |||||
| | * | | | | | Fix then-catch + error handling in import-account | Dan | 2018-05-31 | 2 | -4/+2 |
| | | | | | | | |||||
| | * | | | | | Importing account by json and private key shows error and does not change ↵ | Dan | 2018-05-31 | 4 | -16/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | account if no selectedAddress comes after import. | ||||
| * | | | | | | Merge pull request #4514 from whymarrh/account-label-type-check | kumavis | 2018-06-07 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add account type assertion to PreferencesController#setAccountLabel | ||||
| | * | | | | | | Add account type assertion to PreferencesController#setAccountLabel | Whymarrh Whitby | 2018-06-06 | 1 | -0/+1 |
| | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | i18n - ja improvements | 03-26 | 2018-06-07 | 7 | -18/+75 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #4515 from MetaMask/master | Thomas Huang | 2018-06-07 | 2 | -2/+12 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Merge Master into Develop | ||||
| | * \ \ \ \ \ | Merge pull request #4511 from MetaMask/v4.7.4 | kumavis | 2018-06-06 | 8 | -49/+102 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Version 4.7.4 | ||||
| | | * | | | | | | 4.7.4v4.7.4 | kumavis | 2018-06-06 | 2 | -1/+6 |
| | | | | | | | | | |||||
| | | * | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into v4.7.4 | kumavis | 2018-06-06 | 2 | -2/+7 |
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| / / / / / | | | |/ / / / / | |||||
| | * | | | | | | Merge pull request #4490 from MetaMask/v4.7.3 | Thomas Huang | 2018-06-05 | 20 | -41/+293 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Version 4.7.3 | ||||
| | | * | | | | | | changelog - add note on new modalv4.7.3 | kumavis | 2018-06-05 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into v4.7.3 | kumavis | 2018-06-05 | 3 | -3/+3 |
| | | |\ \ \ \ \ \ | | | | | |_|_|/ / | | | | |/| | | | | |||||
| | | * | | | | | | 4.7.3 | kumavis | 2018-06-05 | 2 | -2/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #4507 from whymarrh/fix-account-order | Dan J Miller | 2018-06-07 | 10 | -45/+25 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | Render accounts in keyring order | ||||
| | * | | | | | | | Fix mock addresses used for integration tests | Whymarrh Whitby | 2018-06-06 | 6 | -18/+18 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix account list order for the old UI | Whymarrh Whitby | 2018-06-06 | 1 | -2/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | Render the accounts in keyring order | Whymarrh Whitby | 2018-06-06 | 1 | -3/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | Remove unused identities reducer from UI | Whymarrh Whitby | 2018-06-06 | 2 | -22/+0 |
| |/ / / / / / / | |||||
* | | | | | | | | lint - remove unused require | kumavis | 2018-06-07 | 1 | -1/+0 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-06-07 | 88 | -416/+1325 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine | ||||
| * | | | | | | | Merge pull request #4509 from whymarrh/wallet-view-assertion | kumavis | 2018-06-06 | 1 | -5/+7 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add explicit selectedAddress assertion to the wallet view | ||||
| | * | | | | | | | Remove selectedIdentity prop from wallet view | Whymarrh Whitby | 2018-06-06 | 1 | -5/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The selectedIdentity property is computed based on the selectedAddress which means that using both the selectedAddress and the selectedIdentity is redundant. In the case of the Array#find call on the set of keyrings, we wouldn't have a situation where one is included and the other isn't. This changeset removes the selectedIdentity from the wallet view because it isn't needed. | ||||
| | * | | | | | | | Ensure selectedAddress exists when render wallet | Whymarrh Whitby | 2018-06-06 | 1 | -0/+4 |
| | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #4506 from MetaMask/diagnostics-multivault | kumavis | 2018-06-06 | 5 | -43/+89 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | diagnostics - add multiple vault detection to diagnostics reporting | ||||
| | * | | | | | | diagnostics - fix reportMultipleKeyrings call | kumavis | 2018-06-06 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | diagnostics - minor fixes | kumavis | 2018-06-06 | 2 | -5/+5 |
| | | | | | | | | |||||
| | * | | | | | | lint - fix diagnostics reporter | kumavis | 2018-06-06 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | diagnostics - rewrite bug-notifier as diagnostics-reporter | kumavis | 2018-06-06 | 5 | -71/+84 |
| | | | | | | | | |||||
| | * | | | | | | add multivault detection to diagnostics reporting | kumavis | 2018-06-06 | 1 | -0/+33 |
| |/ / / / / / | |||||
| * | / / / / | Update hide-token-confirmation-modal.js to use new modalState schema (#4482) | Dan J Miller | 2018-06-05 | 3 | -3/+3 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update hide-token-confirmation-modal.js to use new modalState schema (added in 41e38fe55). * Fix modalState props | ||||
| * | | | | | Merge pull request #4486 from MetaMask/i4475-ClearUnknownIdentities | kumavis | 2018-06-05 | 5 | -4/+135 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Clear unknown identities | ||||
| | * | | | | | Record identity before deleting it | Dan Finlay | 2018-06-05 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Mock notifier in test | Dan Finlay | 2018-06-05 | 2 | -1/+7 |
| | | | | | | | |||||
| | * | | | | | Add comment | Dan Finlay | 2018-06-05 | 1 | -0/+2 |
| | | | | | | | |||||
| | * | | | | | Do not alert to user | Dan Finlay | 2018-06-05 | 1 | -5/+0 |
| | | | | | | | |||||
| | * | | | | | Linted | Dan Finlay | 2018-06-05 | 2 | -1/+2 |
| | | | | | | | |||||
| | * | | | | | Add bug info under metadata key | Dan Finlay | 2018-06-05 | 1 | -1/+7 |
| | | | | | | | |||||
| | * | | | | | Add first time info to bug report | Dan Finlay | 2018-06-05 | 2 | -1/+5 |
| | | | | | | | |||||
| | * | | | | | Add version to report | Dan Finlay | 2018-06-05 | 2 | -4/+6 |
| | | | | | | | |||||
| | * | | | | | Add changelog entry | Dan Finlay | 2018-06-05 | 1 | -0/+2 |
| | | | | | | | |||||
| | * | | | | | Fine tune error posting | Dan Finlay | 2018-06-05 | 2 | -6/+2 |
| | | | | | | | |||||
| | * | | | | | Only notify first time lost ids are detected | Dan Finlay | 2018-06-05 | 1 | -2/+8 |
| | | | | | | | |||||
| | * | | | | | Add reporting uri | Dan Finlay | 2018-06-05 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Begin adding unconfigured notifier | Dan Finlay | 2018-06-05 | 2 | -13/+21 |
| | | | | | | | |||||
| | * | | | | | Persist lost identities to storage for later analysis | Dan Finlay | 2018-06-05 | 2 | -2/+33 |
| | | | | | | | |||||
| | * | | | | | Add minimal user notification of issue. | Dan Finlay | 2018-06-05 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Add identity synchronizing code | Dan Finlay | 2018-06-05 | 2 | -1/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses #4475, where entries in the identities object do not necessarily have corresponding accounts in the vault. On password submission, this change passes known accounts to the preferencesController (responsible for nickname management), and removes unknown entries. Includes "TODO" notes for where we could log the issue to sentry or notify the user. | ||||
| | * | | | | | Add failing test for unknown identity entry | Dan Finlay | 2018-06-05 | 1 | -3/+28 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #4428 from MetaMask/fix-tokenlist-balance-overflow | Dan J Miller | 2018-06-05 | 2 | -4/+13 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Token name is not hidden in wallet if balance is exceptionally long. | ||||
| | * \ \ \ \ | Merge pull request #4432 from alextsg/fix-tokenlist-balance-overflow | Dan J Miller | 2018-06-02 | 1 | -5/+6 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Fix ellipses | ||||
| | | * | | | | | Fix ellipses | Alexander Tseung | 2018-06-01 | 1 | -5/+6 |
| | |/ / / / / | |||||
| | * | | | | | Token name is not hidden in wallet if balance is exceptionally long. | Dan | 2018-06-01 | 2 | -3/+11 |
| | | | | | | | |||||
| * | | | | | | Reduce height of notice container in onboarding (#4435) | Alexander Tseung | 2018-06-05 | 1 | -8/+9 |
| | | | | | | | |||||
| * | | | | | | Indicate the current selected account on the popup account view (#4445) | Alexander Tseung | 2018-06-05 | 8 | -21/+127 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #4471 from MetaMask/master | Dan Finlay | 2018-06-04 | 3 | -9/+23 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | 4.7.2 - Merge master into develop | ||||
| | * | | | | | Merge pull request #4470 from MetaMask/v4.7.2 | Dan Finlay | 2018-06-04 | 11 | -24/+85 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Version 4.7.2 | ||||
| | | * | | | | | 4.7.2 - additional changelog notesv4.7.2 | kumavis | 2018-06-04 | 1 | -0/+3 |
| | | | | | | | | |||||
| | | * | | | | | 4.7.2 | kumavis | 2018-06-04 | 2 | -1/+5 |
| | | | | | | | | |||||
| | | * | | | | | deps - update package-lock via npm@5.10.0 | kumavis | 2018-06-04 | 1 | -8/+15 |
| | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge pull request #4467 from MetaMask/preferences-account-sync | Dan Finlay | 2018-06-04 | 2 | -3/+34 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | bugfix - update preferences controller identities on keyring controller update | ||||
| | * | | | | | | metamask-controller - clear account labels on restore from seed phrase | kumavis | 2018-06-04 | 1 | -0/+4 |
| | | | | | | | | |||||
| | * | | | | | | preferences controller - jsdoc fix | kumavis | 2018-06-04 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | metamask - update preferences controller identities on keyring controller update | kumavis | 2018-06-04 | 2 | -3/+30 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #4353 from MetaMask/publishing-guide-update | kumavis | 2018-06-04 | 1 | -7/+21 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | Update publishing guide | ||||
| | * | | | | | | Update publishing.md | Dan Finlay | 2018-05-24 | 1 | -5/+5 |
| | | | | | | | | |||||
| | * | | | | | | Update publishing guide | Dan Finlay | 2018-05-24 | 1 | -6/+20 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #4426 from MetaMask/sentry-url-rewrite-fix | kumavis | 2018-06-04 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | sentry - message rewrite - guard against missing message | ||||
| | * | | | | | | sentry - message rewrite - guard against missing message | kumavis | 2018-05-31 | 1 | -1/+1 |
| | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge pull request #4425 from MetaMask/master | kumavis | 2018-06-02 | 3 | -2/+28 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | Merge Master into Develop | ||||
| | * | | | | | Merge pull request #4449 from MetaMask/Version-4.7.1 | kumavis | 2018-06-02 | 42 | -271/+434 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Version 4.7.1 | ||||
| | | * | | | | | Version 4.7.1v4.7.1 | Dan Finlay | 2018-06-02 | 3 | -1/+22 |
| | | | | | | | | |||||
| | | * | | | | | Merge branch 'master' into develop | Dan Finlay | 2018-06-02 | 2 | -2/+7 |
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Merge pull request #4408 from MetaMask/v4.7.0rc2 | Thomas Huang | 2018-05-31 | 205 | -18582/+12645 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Version 4.7.0 - rc2 | ||||
| | | * | | | | | | 4.7.0v4.7.0 | kumavis | 2018-05-31 | 2 | -2/+6 |
| | | | | | | | | | |||||
| | | * | | | | | | changelog - add note on brave | kumavis | 2018-05-31 | 1 | -0/+1 |
| | | | |/ / / / | | | |/| | | | | |||||
| * | | | | | | | Merge pull request #4436 from MetaMask/bmd/update-zenhub-links | Dan Finlay | 2018-06-02 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | update helpscout links to zendesk | ||||
| | * | | | | | | | update helpscout links to zenhub | Bobby Dresser | 2018-06-01 | 2 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #4438 from wjmelements/yarn | Dan Finlay | 2018-06-02 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Suggest Yarn for Node >= 10 | ||||
| | * | | | | | | | | recommend yarn for node >= 10 | William Morriss | 2018-06-01 | 1 | -1/+3 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge pull request #4450 from MetaMask/fix-migration-26 | Dan Finlay | 2018-06-02 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | Fix return value of migration 26 when missing KC or PC | ||||
| | * | | | | | | | Fix return value of migration 26 when missing KC or PC | Whymarrh Whitby | 2018-06-02 | 1 | -1/+1 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #4433 from MetaMask/i4431-error-throwing | kumavis | 2018-06-02 | 2 | -30/+24 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | End json-rpc-engine stack on error | ||||
| | * | | | | | | Properly end the middleware stack on RPC error | bitpshr | 2018-06-02 | 2 | -30/+24 |
| |/ / / / / / | |||||
| * | | | | | | Add new alert modals | Alexander Tseung | 2018-06-01 | 21 | -178/+309 |
| | | | | | | | |||||
| * | | | | | | Change btn-secondary styles to btn-default. Make btn-secondary red warning ↵ | Alexander Tseung | 2018-06-01 | 16 | -62/+79 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | style buttons | ||||
| * | | | | | Merge pull request #4419 from MetaMask/deps-bump-keyring-controller | kumavis | 2018-05-31 | 2 | -8/+14 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | deps - bump eth-keyring-controller for bugfix | ||||
| | * | | | | deps - bump eth-keyring-controller for bugfix | kumavis | 2018-05-31 | 2 | -8/+14 |
| |/ / / / | |||||
| * | | | | Prevent loading screen from overlaying the app bar (#4417) | Alexander Tseung | 2018-05-31 | 4 | -12/+4 |
| | | | | | |||||
| * | | | | Merge pull request #4407 from MetaMask/e2e-test | kumavis | 2018-05-31 | 1 | -0/+7 |
| |\ \ \ \ | | | | | | | | | | | | | Adds account in e2e test | ||||
| | * | | | | Delay before getting address text | Thomas | 2018-05-30 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Merge branch 'develop' into e2e-test | Thomas | 2018-05-30 | 11 | -79/+143 |
| | |\ \ \ \ | |||||
| | * | | | | | Add account | Thomas | 2018-05-30 | 1 | -0/+6 |
| | | | | | | | |||||
| * | | | | | | Fix error handling on incorrect password (#4401) | Alexander Tseung | 2018-05-31 | 1 | -11/+9 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge pull request #4402 from MetaMask/danjm-changelog-update-52918 | kumavis | 2018-05-30 | 1 | -0/+11 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | Update changelog | ||||
| | * | | | | Update changelog | Dan J Miller | 2018-05-30 | 1 | -0/+11 |
| | | | | | | |||||
| * | | | | | Merge pull request #4403 from MetaMask/bugfix-keyring-controller | kumavis | 2018-05-30 | 3 | -55/+60 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | deps - bump eth-keyring-controller + update package-lock | ||||
| | * | | | | | ci - job-screens - use e2e funcs | kumavis | 2018-05-30 | 1 | -6/+4 |
| | | | | | | | |||||
| | * | | | | | deps - bump eth-keyring-controller + update package-lock | kumavis | 2018-05-30 | 2 | -49/+56 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #4374 from MetaMask/test-unit-fail-on-only | kumavis | 2018-05-30 | 2 | -1/+8 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | test - unit - fail if tests contain a .only call | ||||
| | * | | | | | test - unit - fail if tests contain a .only call | kumavis | 2018-05-26 | 2 | -1/+8 |
| | | | | | | | |||||
| * | | | | | | Add rpc key to i18n messages (#4375) | Alexander Tseung | 2018-05-30 | 1 | -0/+3 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Merge pull request #4399 from MetaMask/merge-master | kumavis | 2018-05-30 | 7 | -23/+72 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | Pull master changes back into develop | ||||
| | * | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-05-30 | 7 | -23/+72 |
| |/| | | | | | | |/ / | | |/| | | | | | | | merge-master | ||||
| | * | | | Merge pull request #4384 from antonper/master | kumavis | 2018-05-30 | 3 | -10/+37 |
| | |\ \ \ | | | | | | | | | | | | | UI Errors stack cleaned | ||||
| | | * | | | cleanErrorStack moved to separate library module | Anton | 2018-05-29 | 3 | -19/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | more errors traces cleaned up | ||||
| | | * | | | error message fix | Anton | 2018-05-29 | 1 | -2/+1 |
| | | | | | | |||||
| | | * | | | Clean up user rejection error message | Anton | 2018-05-28 | 1 | -3/+14 |
| | |/ / / | |||||
| | * | | | Merge pull request #3997 from jakubsta/master | kumavis | 2018-05-22 | 2 | -5/+12 |
| | |\ \ \ | | | | | | | | | | | | | Allow other extensions to connect | ||||
| | | * | | | Update: allow other extension to connect | Jakub Stasiak | 2018-04-18 | 2 | -5/+12 |
| | | | | | | |||||
| | * | | | | Merge pull request #4140 from MetaMask/v4.6.1 | Thomas Huang | 2018-05-01 | 43 | -660/+887 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Version 4.6.1 | ||||
| | | * | | | | Version 4.6.1 | kumavis | 2018-05-01 | 2 | -2/+9 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #4131 from MetaMask/emitter-cleanup | kumavis | 2018-05-01 | 1 | -7/+14 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | transactions - run event emitters outside context of _setTxStatus | ||||
| | | * | | | | | require log | frankiebee | 2018-05-01 | 1 | -0/+1 |
| | | | | | | | | |||||
| | | * | | | | | log emitter errors | frankiebee | 2018-04-30 | 1 | -6/+10 |
| | | | | | | | | |||||
| | | * | | | | | transactions - run event emitters outside context of _setTxStatus | frankiebee | 2018-04-30 | 1 | -7/+9 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #4394 from MetaMask/MissionStatement | kumavis | 2018-05-30 | 2 | -2/+20 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add mission statement v1 | ||||
| | * | | | | | | | Mission v2 | Dan Finlay | 2018-05-30 | 1 | -3/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | Add mission statement v1 | Dan Finlay | 2018-05-30 | 2 | -2/+20 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #4390 from MetaMask/i18n-brave-fix | kumavis | 2018-05-30 | 1 | -4/+7 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | i18n - getFirstPreferredLangCode - guard against missing i18n api | ||||
| | * | | | | | | | | i18n - getFirstPreferredLangCode - guard against missing i18n api | kumavis | 2018-05-29 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix for brave | ||||
| * | | | | | | | | | Add notification for dropped retry transactions (#4363) | Alexander Tseung | 2018-05-30 | 16 | -71/+317 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix add-token token list placeholder width (#4365) | Alexander Tseung | 2018-05-30 | 1 | -0/+4 |
| | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Fix text field labels of first time flow. Add text fields to storybook (#4389) | Alexander Tseung | 2018-05-29 | 4 | -44/+84 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #4393 from MetaMask/newui-unlock-catch | kumavis | 2018-05-29 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | newui - unlock - dont catch errors unrelated to tryUnlockMetamask | ||||
| | * | | | | | | | | newui - unlock - dont catch errors unrelated to tryUnlockMetamask | kumavis | 2018-05-29 | 1 | -2/+2 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge pull request #4391 from MetaMask/newui-imported-accounts-select-fix | kumavis | 2018-05-29 | 1 | -10/+10 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | metamask-controller - update preferences controller addresses after import account | ||||
| | * | | | | | | | metamask-controller - lint fix | kumavis | 2018-05-29 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | metamask-controller - update preferences controller addresses after import ↵ | kumavis | 2018-05-29 | 1 | -10/+10 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | account | ||||
* | | | | | | | | test - unit - tx-controller - fix blockTracker stub | kumavis | 2018-05-29 | 1 | -0/+1 |
| | | | | | | | | |||||
* | | | | | | | | controllers - transactions - fix tx status update on boot | kumavis | 2018-05-29 | 2 | -2/+13 |
| | | | | | | | | |||||
* | | | | | | | | controllers - transactions - fix tx confirmation | kumavis | 2018-05-29 | 2 | -3/+3 |
| | | | | | | | | |||||
* | | | | | | | | newui - unlock - dont catch errors unrelated to tryUnlockMetamask | kumavis | 2018-05-29 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | metamask-controller - lint fix | kumavis | 2018-05-29 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | metamask-controller - update preferences controller addresses after import ↵ | kumavis | 2018-05-29 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | account | ||||
* | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-05-29 | 8 | -15/+1013 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network-remove-provider-engine | ||||
| * | | | | | | | Merge pull request #4373 from whymarrh/new-ui-e2e | kumavis | 2018-05-29 | 7 | -12/+1143 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | Basic end-to-end (e2e) tests for the new UI | ||||
| | * | | | | | | Add basic e2e tests for the new UI | Whymarrh Whitby | 2018-05-25 | 6 | -2/+973 |
| | | | | | | | | |||||
| | * | | | | | | fix: Why does npm insist on reordering the lockfile? | Whymarrh Whitby | 2018-05-25 | 1 | -10/+170 |
| |/ / / / / / | |||||
| * | | | | | | Merge pull request #4241 from MetaMask/greenkeeper/ethjs-0.4.0 | kumavis | 2018-05-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | Update ethjs to the latest version 🚀 | ||||
| | * | | | | | fix(package): update ethjs to version 0.4.0 | greenkeeper[bot] | 2018-05-12 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fix scrolling in Deposit Ether modal (#4336) | Alexander Tseung | 2018-05-24 | 1 | -2/+4 |
| | | | | | | | |||||
* | | | | | | | test - unit - pending-tx-tracker - update method name | kumavis | 2018-05-29 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | test - unit - nonce-tracker - fix blockTracker stub | kumavis | 2018-05-29 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | controllers - transaction - pending-tx-tracker - lint fix | kumavis | 2018-05-29 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | controllers - transactions - merge @frankiebee's work with mine | kumavis | 2018-05-29 | 7 | -153/+78 |
| | | | | | | | |||||
* | | | | | | | controllers - transactions - pending-tx-tracker - _getBlock - poll until ↵ | kumavis | 2018-05-26 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | block is truthy | ||||
* | | | | | | | tx-gas-utils - query for block without tx bodies | kumavis | 2018-05-26 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | test - unit - metamask-controller - remove log | kumavis | 2018-05-26 | 1 | -1/+0 |
| | | | | | | | |||||
* | | | | | | | test - unit - code style nitpick | kumavis | 2018-05-25 | 1 | -1/+2 |
| | | | | | | | |||||
* | | | | | | | test - unit - metamask-controller - fix many bugs in tests | kumavis | 2018-05-25 | 2 | -33/+61 |
| | | | | | | | |||||
* | | | | | | | test - unit - run ganache-server in background | kumavis | 2018-05-25 | 1 | -0/+7 |
| | | | | | | | |||||
* | | | | | | | test - unit - tx-controller-test - add history object to txMeta when using ↵ | kumavis | 2018-05-25 | 1 | -31/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | internal calls | ||||
* | | | | | | | test - unit - move fetch polyfill to helper | kumavis | 2018-05-25 | 3 | -6/+3 |
| | | | | | | | |||||
* | | | | | | | test - unit - metamask-controller - polyfill global.fetch | kumavis | 2018-05-25 | 1 | -2/+4 |
| | | | | | | | |||||
* | | | | | | | deps - bump eth-json-rpc-middleware for fetch bugfix | kumavis | 2018-05-25 | 2 | -4/+4 |
| | | | | | | | |||||
* | | | | | | | metamask-controller - wrap txController.addUnapprovedTx for wallet ↵ | kumavis | 2018-05-25 | 1 | -1/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | middleware reference before txController is instantiated | ||||
* | | | | | | | test - remove .only from unit tests | kumavis | 2018-05-25 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | provider - update wallet hooks for new wallet middleware | kumavis | 2018-05-25 | 6 | -68/+114 |
| | | | | | | | |||||
* | | | | | | | deps - bump json-rpc modules for bugfixes | kumavis | 2018-05-25 | 2 | -187/+403 |
| | | | | | | | |||||
* | | | | | | | metamask-controller - fix account lookup hook | kumavis | 2018-05-25 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | account-tracker - guard against empty block | kumavis | 2018-05-25 | 1 | -1/+2 |
| | | | | | | | |||||
* | | | | | | | controllers - recent-blocks - guard against empty block | kumavis | 2018-05-25 | 1 | -3/+3 |
| | | | | | | | |||||
* | | | | | | | controllers - recent-blocks - wrap block-tracker event in try-catch | kumavis | 2018-05-24 | 1 | -1/+7 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'network-remove-provider-engine' of ↵ | kumavis | 2018-05-24 | 3 | -40/+44 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | github.com:MetaMask/metamask-extension into network-remove-provider-engine | ||||
| * \ \ \ \ \ \ | Merge pull request #4347 from MetaMask/transactions-use-new-block-tracker | kumavis | 2018-05-24 | 3 | -40/+44 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Transactions use new block tracker | ||||
| | * \ \ \ \ \ \ | Merge branch 'network-remove-provider-engine' of ↵ | frankiebee | 2018-05-23 | 122 | -17010/+4318 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/MetaMask/metamask-extension into transactions-use-new-block-tracker | ||||
| | * | | | | | | | | transactions - update pending-tx-tracker to use the new block tracker | frankiebee | 2018-05-23 | 2 | -8/+19 |
| | | | | | | | | | | |||||
| | * | | | | | | | | remove dependance on the even tx:confirmed | frankiebee | 2018-05-23 | 1 | -2/+6 |
| | | | | | | | | | | |||||
| | * | | | | | | | | test pending-tx-tracker - update tests to reflect new block tracker behavior ↵ | frankiebee | 2018-05-23 | 1 | -32/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and remove tx:confirmed event tests | ||||
* | | | | | | | | | | deps - bump eth-block-tracker for bugfix | kumavis | 2018-05-24 | 1 | -1/+1 |
| | | | | | | | | | | |||||
* | | | | | | | | | | sentry - setupRaven - ensure message is truthy | kumavis | 2018-05-24 | 1 | -2/+2 |
| | | | | | | | | | | |||||
* | | | | | | | | | | controllers - recent-blocks - ensure full blocks | kumavis | 2018-05-24 | 1 | -2/+2 |
|/ / / / / / / / / | |||||
* | | | | | | | | | controllers - account-tracker - refactor + update for eth-block-tracker@4 | kumavis | 2018-05-24 | 1 | -67/+56 |
| | | | | | | | | | |||||
* | | | | | | | | | controllers - recent-blocks - doc update | kumavis | 2018-05-24 | 1 | -4/+4 |
| |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-05-23 | 1 | -15/+7 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | network-remove-provider-engine | ||||
| * | | | | | | | Merge pull request #4337 from MetaMask/recent-blocks-parallel | Frankie | 2018-05-23 | 1 | -15/+7 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | controllers - recent-blocks - pull first historical blocks in parallel | ||||
| | * | | | | | | | controllers - recent-blocks - pull first historical blocks in parallel | kumavis | 2018-05-22 | 1 | -15/+7 |
| | | | | | | | | | |||||
* | | | | | | | | | deps - eth-json-rpc-filters@2.0.0 | kumavis | 2018-05-23 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | deps - eth-block-tracker@4.0.1 | kumavis | 2018-05-23 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-05-23 | 121 | -16993/+4309 |
|\| | | | | | | | | |_|/ / / / / / |/| | | | | | | | | | | | | | | | network-remove-provider-engine | ||||
| * | | | | | | | Merge pull request #4321 from MetaMask/testing | kumavis | 2018-05-23 | 36 | -1557/+691 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | MM controller tests and reorganizing test files | ||||
| | * | | | | | | | Merge branch 'develop' into testing | tmashuang | 2018-05-22 | 6 | -53/+57 |
| | |\| | | | | | | |||||
| | * | | | | | | | Merge branch 'develop' into testing | tmashuang | 2018-05-22 | 9 | -13446/+22 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'develop' into testing | tmashuang | 2018-05-22 | 23 | -1810/+342 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'develop' into testing | tmashuang | 2018-05-22 | 8 | -548/+1503 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Moved loose some loose test files to sub folders | tmashuang | 2018-05-21 | 29 | -59/+108 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | signMessage and signPersonalMessage | Thomas | 2018-05-18 | 1 | -13/+33 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 'develop' into testing | Thomas | 2018-05-17 | 26 | -328/+371 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'develop' into testing | Thomas | 2018-05-17 | 62 | -2419/+5812 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'testing' of https://github.com/tmashuang/metamask-extension ↵ | Thomas | 2018-05-17 | 245 | -5461/+19016 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into testing | ||||
| | | * | | | | | | | | | | | | console.log -> assert.equal | Thomas | 2018-05-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | ImportAccountWithStrategies Json and Keystore | Thomas | 2018-05-09 | 1 | -0/+30 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Remove approvePersonalMessage test | Thomas | 2018-05-08 | 1 | -45/+0 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Merge branch 'develop' into testing | Thomas | 2018-05-08 | 114 | -1662/+7483 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | Bump package-lock | Thomas | 2018-04-25 | 1 | -621/+186 |
| | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | setupUntrustedCommunication and setupTrustedCommunication | Thomas | 2018-04-25 | 2 | -1/+46 |
| | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | Merge branch 'master' into testing | Thomas | 2018-04-24 | 117 | -1908/+5281 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | ConfigManager markAccountsFound, markPasswordForgotten, unMarkPasswordForgotten | Thomas | 2018-04-24 | 1 | -7/+70 |
| | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | resetAccount and addNewAccount | Thomas | 2018-04-20 | 1 | -0/+45 |
| | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | newUnsignedMessage and newUnsignedPersonalMessage | Thomas | 2018-04-19 | 1 | -0/+102 |
| | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | Merge branch 'master' into testing | Thomas | 2018-04-11 | 136 | -3068/+10732 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | MM-controlller tests | Thomas | 2018-04-11 | 1 | -2/+55 |
| | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | Update Sinon methods. sinon.sandbox.create() -> sandbox.createSandbox() | Thomas | 2018-04-05 | 7 | -8/+8 |
| | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | Merge branch 'testing' of https://github.com/tmashuang/metamask-extension ↵ | Thomas | 2018-04-03 | 3 | -7/+466 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into testing | ||||
| | * | | | | | | | | | | | | | | | | | Update sinion methods. sandbox.create() -> createSandbox() | Thomas | 2018-04-05 | 7 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Merge branch 'testing' of https://github.com/tmashuang/metamask-extension ↵ | Thomas | 2018-04-05 | 3 | -7/+466 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into testing | ||||
| | | * | | | | | | | | | | | | | | | | Metamask controller methods | Thomas | 2018-03-28 | 1 | -1/+146 |
| | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | Remove console.log | Thomas | 2018-03-28 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | Update blacklist | Thomas | 2018-03-28 | 1 | -5/+320 |
| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #4333 from MetaMask/test-e2e-check-for-errors | Thomas Huang | 2018-05-23 | 3 | -52/+89 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test - e2e - check for console errors after each test | ||||
| | * | | | | | | | | | | | | | | | | | | test - e2e - only inspect console for errors in chrome | kumavis | 2018-05-22 | 1 | -6/+10 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | test - e2e - ignore 'development build of Redux' warning | kumavis | 2018-05-22 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | test - e2e - ignore 'development build of React' warning | kumavis | 2018-05-22 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | test - e2e - ignore favicon 404s | kumavis | 2018-05-22 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | old-ui - app - use state.metamask.selectedAddress instead of currentView.context | kumavis | 2018-05-22 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | old-ui - ens-input - fix params passed to input | kumavis | 2018-05-22 | 1 | -48/+53 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | test - e2e - ignore react 'unknown props dataset' warnings | kumavis | 2018-05-22 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | test - e2e - check for console errors after each test | kumavis | 2018-05-22 | 1 | -1/+17 |
| | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #4308 from MetaMask/i4232-addtoken | kumavis | 2018-05-23 | 52 | -1086/+1442 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update designs for Add Token screen | ||||
| | * | | | | | | | | | | | | | | | | | | Update input field border on focus | Alexander Tseung | 2018-05-22 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Fix tests | Alexander Tseung | 2018-05-21 | 3 | -41/+50 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | Update designs for Add Token screen | Alexander Tseung | 2018-05-20 | 50 | -1056/+1401 |
| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Merge pull request #4338 from MetaMask/ci-job-screens-enhance | Thomas Huang | 2018-05-23 | 2 | -95/+131 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ci - screens - continue screenshots through account creation + export account | ||||
| | * | | | | | | | | | | | | | | | | | | ci - screens - continue screenshots through account creation + export account | kumavis | 2018-05-22 | 2 | -95/+131 |
| |/ / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | Reveal get filtered tx list (#4332) | Frankie | 2018-05-22 | 3 | -46/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add getFilteredTxList from txController to getApi * transactions - remove dead code (isNonceTaken) | ||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #4297 from MetaMask/ci-publish-release | Thomas Huang | 2018-05-22 | 3 | -7/+56 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | CI - publish release/prerelease | ||||
| | * | | | | | | | | | | | | | | | | | Merge branch 'develop' into ci-publish-release | kumavis | 2018-05-22 | 34 | -14106/+1855 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | ci - add docs publish to job-publish-release | kumavis | 2018-05-19 | 2 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | docs - jsdoc - fix syntax | kumavis | 2018-05-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | ci - add prep-docs job | kumavis | 2018-05-19 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | ci - add job-publish-release | kumavis | 2018-05-19 | 1 | -0/+21 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | ci - rename job-publish to job-publish-prerelease | kumavis | 2018-05-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | ci - clean - whitespace fix | kumavis | 2018-05-19 | 1 | -4/+3 |
| | | |_|_|_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Merge pull request #4295 from MetaMask/kumavis-patch-3 | Frankie | 2018-05-22 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | ui - token-util - warn via loglevel on token lookup failure | ||||
| | * | | | | | | | | | | | | | | | | | token-util - warn via loglevel on token lookup failure | kumavis | 2018-05-19 | 1 | -1/+2 |
| | |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | Merge pull request #4319 from MetaMask/ci-test-deps | Frankie | 2018-05-22 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI - remove node security test as blocker for prerelease builds + screenshots | ||||
| | * | | | | | | | | | | | | | | | | | CI - remove node security test as blocker for builds | kumavis | 2018-05-22 | 1 | -2/+1 |
| | | |_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | Merge pull request #4328 from MetaMask/i4325-yarnignore | Frankie | 2018-05-22 | 1 | -13432/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove yarn.lock |