Commit Graph

2202 Commits

Author SHA1 Message Date
PhyrexTsai f90d070190
Merge branch 'develop' into portal-metamask 2018-06-01 15:41:18 +08:00
Yung chieh Tsai cc5bdadbf1 Update 404 2018-06-01 15:30:57 +08:00
Yung chieh Tsai 77d17f2d55 Update ipfs to infura 2018-06-01 11:27:05 +08:00
Yung chieh Tsai 4e14313ba8 Update manifest.json 2018-06-01 11:26:44 +08:00
Alexander Tseung cc73d869fe Add new alert modals 2018-05-31 10:37:52 -07:00
Yung chieh Tsai 181a11eae2 Update default provider 2018-05-30 09:57:31 +08:00
Alexander Tseung a19b911feb
Add rpc key to i18n messages (#4375) 2018-05-29 18:31:32 -07:00
kumavis 4205d92729 Merge branch 'master' of github.com:MetaMask/metamask-extension into merge-master 2018-05-29 16:12:36 -07:00
kumavis 39069710d1
Merge pull request #4390 from MetaMask/i18n-brave-fix
i18n - getFirstPreferredLangCode - guard against missing i18n api
2018-05-29 11:05:12 -07:00
Alexander Tseung 41e38fe553
Add notification for dropped retry transactions (#4363) 2018-05-29 10:23:06 -07:00
Yung chieh Tsai 384cb126dd Update lib 2018-05-29 19:29:12 +08:00
kumavis 7e87600042
metamask-controller - lint fix 2018-05-28 23:14:38 -07:00
kumavis 09601439e3 metamask-controller - update preferences controller addresses after import account 2018-05-28 23:00:22 -07:00
kumavis e3ecc94a52
i18n - getFirstPreferredLangCode - guard against missing i18n api
fix for brave
2018-05-28 21:50:23 -07:00
Yung chieh Tsai 829deacb57 Rename files 2018-05-29 12:44:37 +08:00
Yung chieh Tsai 86ead431c3 Update manifest.json 2018-05-29 12:39:10 +08:00
MikeCheng1208 8b8cc94f6f Intergrate ENS with IPFS 2018-05-29 12:38:32 +08:00
MikeCheng1208 88a6b4edc7 setTimeout bug fix 2018-05-29 12:38:32 +08:00
MikeCheng1208 695b157e7b Intergrate ENS with IPFS 2018-05-29 12:38:25 +08:00
Anton 71a6e97327 cleanErrorStack moved to separate library module
more errors traces cleaned up
2018-05-28 22:57:08 +02:00
Anton 1d23a5c81b error message fix 2018-05-28 18:08:33 +02:00
Anton 62dc6e20eb Clean up user rejection error message 2018-05-28 17:57:45 +02:00
Frankie ed01c6c826
Merge pull request #4337 from MetaMask/recent-blocks-parallel
controllers - recent-blocks - pull first historical blocks in parallel
2018-05-22 16:08:33 -07:00
kumavis b5bbfd3264
Merge pull request #4308 from MetaMask/i4232-addtoken
Update designs for Add Token screen
2018-05-22 12:53:59 -07:00
kumavis fa37ba3992 controllers - recent-blocks - pull first historical blocks in parallel 2018-05-22 01:58:36 -07:00
Frankie e8b2e11c56 Reveal get filtered tx list (#4332)
* add getFilteredTxList from txController to getApi

* transactions - remove dead code (isNonceTaken)
2018-05-21 16:00:44 -07:00
kumavis 7a65c22a02
Merge branch 'develop' into ci-publish-release 2018-05-21 14:58:37 -07:00
kumavis f19d8a5905 Merge branch 'develop' of https://github.com/Trigalti/metamask-extension into Trigalti-develop 2018-05-21 14:14:03 -07:00
kumavis 08d95bbafa
Merge pull request #4034 from whymarrh/account-nicknames
Move account names out of KeyringController
2018-05-21 13:44:07 -07:00
kumavis e447438504
Merge pull request #3997 from jakubsta/master
Allow other extensions to connect
2018-05-21 13:41:09 -07:00
Alexander Tseung 4f6b53c1aa Update designs for Add Token screen 2018-05-19 23:04:19 -07:00
Dan Finlay 713c77db54
Merge pull request #4199 from MetaMask/i3487-provider-errors
RPC error middleware for json-rpc-engine
2018-05-18 11:57:29 -07:00
kumavis 2d4d77b17d docs - jsdoc - fix syntax 2018-05-18 11:52:28 -07:00
simon 22753d96fd Added trailing comma for eslint 2018-05-18 16:11:46 +02:00
simon 41502cb384 Added adyen.com to blacklisted domains because postMessages are blocking card encryption 2018-05-18 15:43:27 +02:00
Whymarrh Whitby 67310e151e Fix migration 026 to produce the correct shape for state.identities 2018-05-17 13:35:38 -02:30
Whymarrh Whitby 2d13fac476 Add migration to move identities from KeyringController 2018-05-17 12:57:39 -02:30
Whymarrh Whitby c54e4c7191 Add PreferencesController#setAddresses to update ids 2018-05-17 12:57:39 -02:30
Whymarrh Whitby cbe4d0d88c Update AddressBookController to read from preferences store 2018-05-17 12:57:39 -02:30
Whymarrh Whitby 924cc1fcf7 Move setAccountLabel into PreferencesController 2018-05-17 12:57:39 -02:30
kumavis 44f31f9a7e Merge branch 'develop' of github.com:MetaMask/metamask-extension into scsaba-transaction-history-timestamps 2018-05-16 13:56:32 -07:00
kumavis 76c8cb3d7b
Merge pull request #4146 from MetaMask/sentry-error-like2
sentry - add helper to fully rewrite all error messages
2018-05-16 13:54:15 -07:00
kumavis 8e1cad5ff6
tx-state-history-helper - use more readable Date.now method 2018-05-16 13:05:07 -07:00
kumavis d62fc22611 network - remove debugging console.log 2018-05-16 11:59:50 -07:00
kumavis c27d9162d7 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-controller-remove-setNetworkEndpoints 2018-05-16 11:57:07 -07:00
bitpshr ce2834400c Add new json-rpc-engine middleware for improved error handling 2018-05-14 08:33:47 -04:00
Alexander Tseung 0bcfbc1544 Add error message when passwords don't match in first time flow. Change input field styling in first time flow 2018-05-13 21:46:12 -07:00
Alexander Tseung 2381c0e0f4 Add new unlock screen design 2018-05-11 12:49:17 -07:00
Orange bfc19e403b Chinese translation Enhancements (#4218) 2018-05-11 10:09:14 -07:00
Csaba Solya 2081768fc5 fix lint issues 2018-05-10 13:43:31 +02:00