m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-01 21:57:06 +01:00
Code
9,577 Commits 2 Branches 0 Tags 265 MiB
83e34d9033
Commit Graph

962 Commits

Author SHA1 Message Date
Dan
f824a2982a Use supersonic instead of httpserver to serve local dapp (e2e beta tests) 2018-06-28 10:16:36 -02:30
Dan
c343a12543 Use locally served dapp to test contract calls in e2e beta tests 2018-06-27 11:08:15 -02:30
brunobar79
6e563acd93 use latest eth-trezor-keyring 2018-06-25 12:24:58 -10:00
brunobar79
87dfca0767 fixes 2018-06-23 02:52:11 -04:00
brunobar79
4381d3e71d point to new version of eth-trezor-keyring 2018-06-22 23:25:19 -04:00
kumavis
ac8b56a00d notices - notices collection is now manually edited 2018-06-13 22:56:46 -07:00
Bruno
bb4cc72646 fix merge conflicts 2018-06-13 02:01:47 -04:00
Bruno
fe3d81cfd8 upgrade eth-trezor-keyring 2018-06-13 01:44:53 -04:00
Bruno
8763ea898e move TrezorKeyring to its own package 2018-06-13 01:32:13 -04:00
Dan Finlay
9c77af1ce6
Add script for auto-re-running tests on change 
`npm run watch:test:unit` will re-run the unit test suite whenever a
file in `app`, `ui`, or `test` changes.
 2018-06-12 11:13:44 -07:00
Bruno
8c4d58aa45 initial trezor support 2018-06-10 03:52:32 -04:00
PhyrexTsai
f90d070190
Merge branch 'develop' into portal-metamask 2018-06-01 15:41:18 +08:00
Dan
5091b03e4b Merge branch 'develop' into i3725-refactor-send-component- 2018-05-31 15:28:03 -02:30
kumavis
b69da50095 deps - bump eth-keyring-controller for bugfix 2018-05-30 14:29:14 -07:00
kumavis
77c55ecd83
Merge pull request #4403 from MetaMask/bugfix-keyring-controller 
deps - bump eth-keyring-controller + update package-lock
 2018-05-29 22:31:58 -07:00
kumavis
4789e981c2
Merge pull request #4374 from MetaMask/test-unit-fail-on-only 
test - unit - fail if tests contain a .only call
 2018-05-29 21:40:28 -07:00
kumavis
d6965c7cdb deps - bump eth-keyring-controller + update package-lock 2018-05-29 17:38:00 -07:00
MikeCheng1208
695b157e7b Intergrate ENS with IPFS 2018-05-29 12:38:25 +08:00
kumavis
1cd4b03b37 test - unit - fail if tests contain a .only call 2018-05-25 12:58:16 -07:00
Whymarrh Whitby
715624227a Add basic e2e tests for the new UI 2018-05-24 23:23:42 -02:30
kumavis
8e672a82e2
Merge pull request #4241 from MetaMask/greenkeeper/ethjs-0.4.0 
Update ethjs to the latest version 🚀
 2018-05-23 16:41:26 -07:00
Dan
440905125d Merge branch 'develop' into i3725-refactor-send-component- 2018-05-23 16:03:15 -02:30
kumavis
cee55b47d0
Merge pull request #4321 from MetaMask/testing 
MM controller tests and reorganizing test files
 2018-05-22 13:02:41 -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
1fbf59cdd3 ci - screens - continue screenshots through account creation + export account 2018-05-22 01:56:52 -07:00
tmashuang
238f2eb179 Merge branch 'develop' into testing 2018-05-21 16:36:48 -07:00
tmashuang
848f8f805b Merge branch 'develop' into testing 2018-05-21 15:14:47 -07:00
kumavis
7a65c22a02
Merge branch 'develop' into ci-publish-release 2018-05-21 14:58:37 -07:00
tmashuang
58b9afff4f Merge branch 'develop' into testing 2018-05-21 14:57:57 -07:00
kumavis
d45fe6fc72 Merge branch 'develop' of https://github.com/Jabher/metamask-extension into Jabher-develop 2018-05-21 13:59:23 -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
tmashuang
554a10f17e Merge branch 'develop' into testing 2018-05-21 13:05:24 -07:00
Alexander Tseung
4f6b53c1aa Update designs for Add Token screen 2018-05-19 23:04:19 -07:00
kumavis
59c9852999 ci - add docs publish to job-publish-release 2018-05-18 14:03:02 -07:00
Whymarrh Whitby
805c6158a4 Update eth-keyring-controller dependency 2018-05-17 12:57:39 -02:30
Thomas
5e80bc4cb9 Merge branch 'develop' into testing 2018-05-16 22:47:07 -07:00
Dan
759bc17388 Merge branch 'develop' into i3725-refactor-send-component- 2018-05-15 11:21:15 -02:30
Thomas
517be35ab6 Merge branch 'develop' into e2e-tests 2018-05-14 17:19:44 -07:00
Thomas
cd42d18203 Merge e2e tests into one 2018-05-14 17:17:36 -07:00
Whymarrh Whitby
b5a445139d Bail after the first e2e test failure 
Where the tests are sequential, every test after the first failure is bound
for failure as well so we can bail after the first.
 2018-05-14 13:55:33 -02:30
Dan
6bc8cc819a Merge branch 'develop' into i3725-refactor-send-component- 2018-05-14 11:44:50 -02:30
Alexander Tseung
2381c0e0f4 Add new unlock screen design 2018-05-11 12:49:17 -07:00
greenkeeper[bot]
f7205e5cc7 fix(package): update ethjs to version 0.4.0 2018-05-11 18:15:10 +00:00
Thomas
3632ea29cc Merge branch 'develop' into e2e-tests 2018-05-11 10:13:44 -07:00
Alexander Tseung
f98aec5f50 Update deep-extend and sshpk 2018-05-09 18:52:35 -07:00
Thomas
26c6bddebf Merge branch 'develop' into e2e-tests 2018-05-08 13:10:26 -07:00
jabher
28126f60f3 bump extensionizer version to 1.0.1 (see https://github.com/MetaMask/extensionizer/pull/4) 2018-05-08 16:47:18 +03:00
Thomas
8250fd9d6d Merge branch 'develop' into testing 2018-05-07 14:30:43 -07:00
Dan
7c49009854 Unit tests for containers, utils and selectors in send_/ 2018-05-05 11:58:14 -04:00
Thomas
f900821a42 Merge branch 'develop' into e2e-tests 2018-05-03 14:10:26 -07:00
Alexander Tseung
d5759cf4a8 Add storybook integration 2018-05-03 10:51:15 -07:00
Alexander Tseung
3b229775a8 Remove eth-block-tracker package 2018-05-02 14:06:34 -07:00
Alexander Tseung
3e4f158b34 Pin chromedriver version to 2.36.0 2018-05-02 13:10:21 -07:00
Alexander Tseung
65253e114f Adds nsp check to CircleCI tests 2018-05-02 12:01:03 -07:00
Alexander Tseung
2c95390229 Adds sass-loader and style-loader packages for storybook integration 2018-05-01 20:05:14 -07:00
Alexander Tseung
a70da53340 Adds path and resolve-url-loader packages for storybook integration 2018-05-01 19:32:20 -07:00
Alexander Tseung
4a54deadf9 Adds css-loader and file-loader needed for storybook integration 2018-05-01 14:28:33 -07:00
Thomas
9dfe4f410d Firefox 2018-05-01 12:18:22 -07:00
Frankie
9b1c07c750
Merge pull request #4111 from MetaMask/build-fix-sourcemaps 
Build - fix sourcemaps
 2018-04-30 10:44:38 -07:00
kumavis
f4fe3e81c1 development - add sourcemap debug tool 2018-04-27 18:17:21 -07:00
kumavis
5c9cb0b787 build - minify via gulp-uglify-es instead of uglifyify 2018-04-27 18:15:50 -07:00
kumavis
b487dab2e7 test - unit - use ganache instead of deprecated block-tracker test util 2018-04-27 17:11:44 -07:00
kumavis
1c63b11e3f rpc - bump provider-engine + eth-json-rpc-filters 2018-04-25 14:02:41 -07:00
Dan Finlay
91161739a5 Move uglifyify to MetaMask org 2018-04-25 10:46:01 -07:00
Dan Finlay
0c5add59f7 Make minified builds more determinstic 
May fix #3999, but will need to see if Mozilla can reproduce the build
with this updated repo.

Switches our `uglifyify` dependency from the production one
(under-maintained) to one that I've merged a critical patch into.

I'm open to discussion of how else we might approach this problem here.
Maybe we should use a different minification module entirely, remove
minification, or maybe refactor our build system!
 2018-04-24 15:01:02 -07:00
Thomas
629457ea54 setupUntrustedCommunication and setupTrustedCommunication 2018-04-24 13:33:31 -07:00
Dan Finlay
f5f5100da7
Merge pull request #4023 from MetaMask/greenkeeper/ethjs-contract-0.2.0 
Update ethjs-contract to the latest version 🚀
 2018-04-23 17:06:46 -07:00
Dan Finlay
9ae2558d20
Merge pull request #3934 from MetaMask/node-engines 
package.json - update engines field to require node v8.x.x
 2018-04-23 16:42:39 -07:00
kumavis
c120fbdfb9 deps - bump sentry for more detailed fetch failure 2018-04-23 10:20:40 -07:00
greenkeeper[bot]
49e02baea0 fix(package): update ethjs-contract to version 0.2.0 2018-04-18 22:09:40 +00:00
frankiebee
e77dbaa0dc deps - update keyring controller and other eth-dependinces 2018-04-17 14:39:02 -07:00
Dan Finlay
6ee57dcad7
Merge branch 'master' into i3580-InternationalizeCurrency 2018-04-17 13:36:21 -07:00
Thomas Huang
7b70804aa0
Merge pull request #3969 from MetaMask/i3966-AddJsDocsPage 
Add JSDocs Page and Script
 2018-04-17 10:01:09 -07:00
bitpshr
4780f825b1 Add ComposableObservableStore for subscription management 2018-04-13 10:20:44 -04:00
Dan Finlay
136caa2034 Add JSDocs Page and Script 
Includes new script `npm run doc` for generating docs page.
 2018-04-12 14:46:05 -07:00
kumavis
f15b81089e
Merge branch 'master' into i3580-InternationalizeCurrency 2018-04-10 02:13:05 -07:00
kumavis
df1f891585
Merge branch 'master' into i3621-LogoPerformance 2018-04-09 13:56:59 -07:00
kumavis
e201ebaf58
Merge pull request #3895 from MetaMask/greenkeeper/gulp-sass-4.0.0 
Update gulp-sass to the latest version 🚀
 2018-04-09 13:40:35 -07:00
kumavis
2a3e634ab9 package.json - update engines field to require node v8.x.x 2018-04-09 13:40:15 -07:00
kumavis
5d7f300af7
Merge pull request #3925 from MetaMask/greenkeeper/ethjs-0.3.4 
Update ethjs to the latest version 🚀
 2018-04-09 13:14:50 -07:00
Dan
2c4426e4de Merge branch 'master' into i3580-InternationalizeCurrency 2018-04-09 16:52:26 -02:30
greenkeeper[bot]
743fb13472 fix(package): update ethjs to version 0.3.4 2018-04-06 23:04:44 +00:00
greenkeeper[bot]
2bfd3de52b fix(package): update gulp-sass to version 4.0.0 2018-04-05 15:51:26 +00:00
Alexander Tseung
34e608e9dc Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-04-03 17:06:00 -07:00
Dan Finlay
74049c19fc Internationalize currency 
Fixes #3580
 2018-04-03 13:58:26 -07:00
Dan Finlay
931ce12073 Improve fox logo performance 
By including metamask-logo@2.1.4

Fixes #3621
 2018-04-03 13:53:02 -07:00
kumavis
92dd2b3218 ci - job-publish - publish source+sourcemaps to sentry if new release 2018-04-03 12:36:46 -07:00
kumavis
00657e14a8 build - correctly set METAMASK_ENV via envify 2018-04-03 09:51:33 -07:00
Alexander Tseung
2e9273d2ac Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-04-03 01:03:51 -07:00
Alexander Tseung
35875863d2 Fix merge conflicts. Modify send workflow 2018-04-03 01:03:31 -07:00
kumavis
655593ea62 Merge branch 'master' of github.com:MetaMask/metamask-extension into build-perf 2018-04-02 16:28:33 -07:00
kumavis
eb7bafc914 deps - update shell-parallel 2018-04-02 15:50:26 -07:00
kumavis
0ff4a1bece Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens 2018-04-02 15:04:48 -07:00
kumavis
2b6557a024 lint - lint json files in app/ 2018-04-02 14:47:47 -07:00
kumavis
98e0fc1ab9 Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens 2018-04-02 14:13:45 -07:00
kumavis
bd6f554766 build - use uglifyify and gulp-multi-process for better performance 2018-03-30 22:19:02 -07:00
Alexander Tseung
51ad2b03c8 Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-03-30 16:34:57 -07:00
Alexander Tseung
ba23843f91 Fix merge conflicts 2018-03-30 16:18:48 -07:00
kumavis
e99a707e3d
Merge pull request #3808 from MetaMask/txMeta-origin 
transactions - add origin to txMeta
 2018-03-30 16:09:00 -07:00
frankiebee
5ec4286966 deps - bump proviedr-engine 2018-03-30 15:24:32 -07:00
kumavis
80839eebe4 build - properly set GULP_METAMASK_DEBUG on dev 2018-03-30 15:09:25 -07:00
kumavis
a3f7cd1cfc development - ci-screens - remove mocha wrapper that was losing exit code 2018-03-30 15:03:49 -07:00
kumavis
7dde948c45 Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens 2018-03-30 13:57:50 -07:00
kumavis
a9391ea2ef ci - e2e+screens - add sleep to make sure ganache is ready 2018-03-30 13:50:19 -07:00
kumavis
2997067ca0 ci - e2e+screens - use shell-parallel to run ganache 2018-03-30 13:48:46 -07:00
Thomas
43c402227d Ganache:start script with seed phrase 2018-03-30 11:51:51 -07:00
kumavis
5945c8cf67 development - create selenium screen shotter 2018-03-30 00:09:39 -07:00
kumavis
8277c662de npm scripts - rewrite default scripts to new task names 2018-03-29 22:58:26 -07:00
kumavis
592c2e5948 test - add auto screen shotter 2018-03-29 17:02:40 -07:00
Alexander Tseung
ef61ef2ce8 Fix i18n merge conflicts 2018-03-29 09:37:29 -07:00
kumavis
e7f655ec6d npm scripts - simplify and speed up dist builds 2018-03-28 23:45:33 -07:00
kumavis
d2874cf89a deps - update package-lock 2018-03-28 23:12:41 -07:00
kumavis
c9a4792304 mascara - use sw-controller and other cleanups 2018-03-28 21:33:04 -07:00
kumavis
c171ea0632 deps - bump ethjs-query to fix unhandled promise rejections 2018-03-28 09:40:11 -07:00
kumavis
871edfe12a
Merge pull request #3713 from MetaMask/greenkeeper/eslint-plugin-mocha-5.0.0 
Update eslint-plugin-mocha to the latest version 🚀
 2018-03-27 19:25:51 -07:00
kumavis
4758a3ef22
Merge pull request #3652 from MetaMask/greenkeeper/sinon-5.0.0 
Update sinon to the latest version 🚀
 2018-03-27 19:22:59 -07:00
kumavis
9e1bdcb09d test - integration - add locale build step 2018-03-27 17:17:34 -07:00
kumavis
914a098c8a Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux 2018-03-27 14:28:37 -07:00
kumavis
5a309328f1 ci - run e2e jobs 2018-03-27 13:36:09 -07:00
Thomas Huang
8648aee907
Merge branch 'master' into selenium-e2e 2018-03-27 13:28:58 -07:00
Alexander Tseung
6f367a5a6b Fix merge conflicts 2018-03-27 00:20:35 -07:00
Dan
4f0881e41b Merge branch 'master' into i18n-translator-redux 2018-03-26 16:13:49 -02:30
greenkeeper[bot]
cecc5c48a7 chore(package): update eslint-plugin-mocha to version 5.0.0 2018-03-24 13:20:46 +00:00
kumavis
079ba3e6ee sentry - npm scripts for uploading source maps 2018-03-23 18:39:10 -07:00
kumavis
e3d7062e9b sentry - rewrite report urls + use raven-js from npm 2018-03-23 17:22:44 -07:00
Dan
b9309f689b Use extension api to get initial locale. 2018-03-22 12:49:19 -02:30
Lazaridis
19621fe879 changes test to unit-integration-lint, closes #3650 2018-03-22 04:44:30 +02:00
Thomas
775275e138 Merge branch 'master' into selenium-e2e 2018-03-21 12:28:03 -07:00
Thomas
d646f37741 Merge branch 'master' into selenium-e2e 2018-03-21 12:25:41 -07:00
Thomas Huang
6a428bbef7
Revert "Issue 3505 | Transpile to ES5" 2018-03-21 12:22:15 -07:00
greenkeeper[bot]
9094af8319 chore(package): update sinon to version 5.0.0 2018-03-21 17:39:53 +00:00
kumavis
de5dee51b1
Merge pull request #3605 from lazaridiscom/master 
use mkdirp for cross-platform, re #3426
 2018-03-20 10:40:15 -07:00
Ryan Rowland
faa2849082 Issue 3505 | Transpile to ES5 2018-03-19 23:11:48 -07:00
Lazaridis
7f00fdcd14 use mkdirp for cross-platform, re #3426 2018-03-18 12:15:29 +02:00
Thomas
6306c7b190 Merge branch 'master' into selenium-e2e 2018-03-14 13:29:47 -07:00
kumavis
e48934dc04 Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-UseStorageLocalInstead 2018-03-13 14:49:26 -07:00
Lazaridis
af4116cf39 use 'cross-env' for env-variables within npm scripts, re #3426 2018-03-13 11:31:11 -07:00
Vincent
0e28e8fa3d Moved mock-dev.js and ui-dev.js to development folder. 2018-03-14 00:15:19 +11:00
Thomas
a3af225e49 Merge branch 'master' into selenium-e2e 2018-03-09 23:58:56 -08:00
kumavis
ddc85354d3
Merge pull request #3501 from MetaMask/circleci-2.0 
ci - introduce circle ci 2.0
 2018-03-09 16:07:28 -08:00
Thomas
d5b1d6182b Merge branch 'master' into selenium-e2e 2018-03-09 15:01:48 -08:00
kumavis
3580196650 test - breakout npm script for building for integration tests 2018-03-09 13:48:48 -08:00
greenkeeper[bot]
ce139db99b chore(package): update gulp-stylelint to version 7.0.0 2018-03-09 11:57:55 -08:00
greenkeeper[bot]
16050f4aeb chore(package): update stylelint-config-standard to version 18.2.0 2018-03-09 11:57:26 -08:00
greenkeeper[bot]
c05b220024 fix(package): update gulp-autoprefixer to version 5.0.0 2018-03-09 11:56:52 -08:00
kumavis
85d48b4fb7 deps - remove unused missippi dep 2018-03-09 11:53:59 -08:00
greenkeeper[bot]
c4f697d87f chore(package): update browserify to version 16.1.1 
Closes #2861
 2018-03-09 11:51:10 -08:00
kumavis
b4a686a5c6 deps - bump pump 2018-03-09 11:51:03 -08:00
Dan Finlay
d0ba2d2d94 Merge branch 'master' into i3076-UseStorageLocalInstead 2018-03-07 13:39:44 -08:00
Thomas Huang
a74439a1a7
Merge pull request #2791 from MetaMask/greenkeeper/karma-2.0.0 
Update karma to the latest version 🚀
 2018-03-07 13:50:41 -05:00
kumavis
8a444ec96f
Merge pull request #3259 from MetaMask/controllerStubs 
Offline testing
 2018-03-06 17:21:36 -08:00
Dan Finlay
423f084cb4 Merge branch 'master' into i3076-UseStorageLocalInstead 2018-03-06 14:59:09 -08:00
Dan Finlay
dd9cac69ae
Merge pull request #3309 from scsaba/edge-support 
Add Edge Support
 2018-03-06 09:39:57 -08:00
Csaba Solya
d8038c0de0 add browserify-unibabel to package.json 2018-03-06 09:23:43 +01:00
Dan Finlay
bf17d7e115 Add version bumping script 
One step towards automating our deploy process is automating our version
bumping scheme. This PR does that.
 2018-03-02 13:55:56 -08:00
Dan Finlay
81fa0742f7 Fix inpage provider name regression 
Fixes #3372 by not minifying the name of our inpage provider, which some
people were using to identify MetaMask (not our preferred, supported
method of web3.currentProvider.isMetaMask).
 2018-03-02 10:32:53 -08:00
Frankie
2b8cfcb73c
Merge pull request #2363 from MetaMask/greenkeeper/metamascara-2.0.0 
Update metamascara to the latest version 🚀
 2018-02-27 11:31:17 -08:00
Csaba S
2f34630486
Merge branch 'master' into edge-support 2018-02-22 14:55:46 +01:00
Csaba Solya
5ec311ba3e add edge support 2018-02-22 14:39:32 +01:00
Thomas Huang
33182efb13 Offline testing 2018-02-15 08:34:31 -08:00
Dan Finlay
e422294ad1 Add node-sass to dev dependencies 
To fix build
 2018-02-13 11:35:30 -08:00
Alexander Tseung
eb919f4710 Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254 2018-02-08 16:43:31 -08:00
Dan
b0db68a281 Merge branch 'uat' into uat-next 2018-02-07 21:19:14 -03:30
Dan
d8896a8c31 Merge branch 'master' into uat 2018-02-07 16:32:47 -03:30
Alexander Tseung
4f1fe1da62 Fix merge conflicts from uat-next 2018-01-31 18:24:20 -08:00
Dan J Miller
78bce55858 [NewUI] Use tooltip for copy to clipboard helper text on main screen. (#3120) 
* Use tooltip for display of helper text in wallet views copy to clipboard feature.

* Use react-tippy in wallet-view.js; center arrow tooltip throughout tooltip text change.

* Remove unnecessary tabIndex attribute from wallet view address element.
 2018-01-31 16:27:35 -08:00
Thomas
a193ba60c6 Add enzyme, redux-test-utils, and enzyme-adapter-react-15 to deps 2018-01-30 13:34:21 -08:00
Alexander Tseung
ecc39c5a7a Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 2018-01-29 18:22:52 -08:00
Thomas Huang
b991ac0422
Merge pull request #2885 from MetaMask/greenkeeper/gulp-watch-5.0.0 
Update gulp-watch to the latest version 🚀
 2018-01-29 10:09:51 -08:00
Thomas Huang
ea68a5d22a
Merge pull request #3026 from MetaMask/greenkeeper/mocha-5.0.0 
Update mocha to the latest version 🚀
 2018-01-29 10:04:41 -08:00
Thomas Huang
5b24ef023a
Merge pull request #3091 from MetaMask/greenkeeper/testem-2.0.0 
Update testem to the latest version 🚀
 2018-01-29 09:56:57 -08:00
Dan Finlay
ceebc6caa4 Debounce storage to avoid crashing pump 2018-01-25 13:01:03 -08:00
kumavis
fe6b11eb50 deps - bump eth-json-rpc-infura for kovan fix 2018-01-25 11:03:50 -08:00
greenkeeper[bot]
145db2906d chore(package): update testem to version 2.0.0 2018-01-24 20:15:48 +00:00
Thomas
97ca86733c Merge branch 'master' into uat 2018-01-23 01:12:50 -08:00
Thomas
baba179ccb Remove duplicate eth-contract-metadata 2018-01-22 16:08:00 -08:00
Kevin Serrano
0373a3840b
Merge pull request #3047 from MetaMask/fix-provider-json-parse 
Fix providers retry logic and retries expired error messages
 2018-01-22 15:12:56 -08:00
kumavis
2b7542054e deps - bump json rpc engine for bugfix 2018-01-22 12:52:15 -08:00
Chi Kei Chan
77c545336b Merge branch 'uat' into newmaster 2018-01-19 15:29:36 -08:00
kumavis
4670aad291 deps - bump provider engine and infura-middleware for better retry and error messages 2018-01-19 14:07:38 -08:00
kumavis
02df9a6bd1 deps - bump providers for better JSON parse error messages 2018-01-19 12:16:53 -08:00
Dan Finlay
98b5a62fa7
Merge pull request #3023 from MetaMask/build-lock-gulp 
build - lock pre-release gulp dep to commit
 2018-01-18 13:12:41 -08:00
kumavis
9f3183ccf3 deps - bump infura provider for uri length limit fix 2018-01-18 11:51:39 -08:00
Thomas Huang
e561740133
Merge branch 'master' into build-lock-gulp 2018-01-18 10:13:31 -08:00
Thomas
0db4ba1086 chromedriver, changed extension id(might need zip/crx file) 2018-01-18 08:10:53 -08:00
Thomas
d317f7aaab Update 2018-01-18 07:43:42 -08:00
kumavis
ab3423d00d deps - re-add eth-block-tracker 2018-01-17 22:07:08 -08:00
kumavis
899e839e7c test - createTestProviderTools includes block tracker layer 2018-01-17 21:43:34 -08:00
kumavis
b70d3a9b6e deps - bump json-rpc-engine for better errors 2018-01-17 20:02:43 -08:00
greenkeeper[bot]
899ddf0179 chore(package): update mocha to version 5.0.0 2018-01-18 02:21:45 +00:00
kumavis
29a6da0d01 build - lock pre-release gulp dep to commit 2018-01-17 17:50:55 -08:00
Alexander Tseung
81f86cfab6 Merge branch 'uat' into uat-master-011618 2018-01-16 18:17:28 -08:00
Dan J Miller
77eb7b2db6 [NewUI-flat] Fix gulp build (#2975) 
* Only run uglify when building for prod; set environment when building for prod; use gulp-uglify-es.

* Revert change of dist script.
 2018-01-15 19:00:07 -08:00
Dan Finlay
5fb2cfed6a
Merge branch 'master' into i2826-SignBytes 2018-01-15 14:20:50 -08:00
Dan Finlay
93d4b22363 Bump keyringController version 2018-01-15 14:11:59 -08:00
kumavis
bfa10e29a1
Merge pull request #2900 from MetaMask/infura-rest-api 
Provider - Use Infura rest api for infura networks
 2018-01-15 12:13:59 -08:00
Dan Finlay
6df3261deb Fix signTypedData bytes signing 
Fixes #2826
 2018-01-13 13:39:21 -08:00
Dan J Miller
41057a76c5 [NewUI] Build mascara with uglification and gzipping. (#2735) 
* Adds uglification and gzipping.

* Build mascara with uglification and gzipping.

* Remove gzipping from extension build.
 2018-01-11 18:15:22 -08:00
Dan Finlay
7ba9ed922a
Merge pull request #2926 from MetaMask/gulp-npmls 
build - add 'deps' step that records output of 'npm ls' into build
 2018-01-11 15:06:36 -08:00
kumavis
cf60b23eec
Merge branch 'master' into infura-rest-api 2018-01-11 11:40:56 -08:00
kumavis
9a603606a6 deps - gulp in dev deps only 2018-01-10 13:51:25 -08:00
kumavis
cc49e637dd deps - bump eth-json-infura 2018-01-09 08:18:58 -08:00
Dan Finlay
dcbecdc1fd
Merge pull request #2796 from MetaMask/filter-case-sensitive 
bugfix: deps - eth-json-rpc-filters@1.2.5
 2018-01-08 15:40:39 -08:00
kumavis
ab7701efb3 provider - infura - use infura REST api 2018-01-08 14:57:57 -08:00
kumavis
2147b8a59a
Merge pull request #2854 from MetaMask/UpdateVinyl-BufferPackage 
Update vinyl-buffer to version 1.0.1
 2018-01-08 12:40:54 -08:00
greenkeeper[bot]
d12c289e91 chore(package): update gulp-watch to version 5.0.0 2018-01-07 05:53:33 +00:00
Dan Finlay
4bca98d588 Derive gas price estimate from previous transactions 
Return the 50th percentile lowest gas price of the previous 20 blocks.
 2018-01-05 21:24:20 -08:00
Thomas Huang
a6760fca25 Update vinyl-buffer to version 1.0.1 2018-01-04 06:40:38 -06:00
Alexander Tseung
be398500de
Merge pull request #2848 from MetaMask/NewUI-flat 
[NewUI] Merge NewUI-flat into uat
 2018-01-03 13:24:17 -08:00
Alexander Tseung
a6f062a686 Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c 2018-01-03 11:06:08 -08:00
Alexander Tseung
dfb2247108 Fix sign typed data 2017-12-29 13:17:26 -08:00
greenkeeper[bot]
37789f2dba chore(package): update vinyl-source-stream to version 2.0.0 2017-12-23 05:35:28 +00:00
Alexander Tseung
409d1d30e9
Merge pull request #2799 from MetaMask/NewUI-flat 
Update UAT to version 4.0.5
 2017-12-22 11:40:20 -08:00
kumavis
023b5c84c4
deps - eth-json-rpc-filters@1.2.5 
fix case sensitive address check in filters
 2017-12-22 10:15:38 -08:00
greenkeeper[bot]
e81ba29359 chore(package): update karma to version 2.0.0 2017-12-21 16:45:03 +00:00
Dan
7915e62d65 Merge branch 'master' into NewUI-flat 2017-12-20 19:16:12 -03:30
Thomas Huang
c6e7bc0a5d Add exit flag to mocha to exit after tests run 2017-12-15 14:41:58 -06:00
Alexander Tseung
d905b86ba7 Add prop-types to package.json, redirect from create-password screen when isInitialized 2017-12-14 14:11:23 -08:00
Alexander Tseung
e226b10a89 Add react-router to allow use of the browser back button 2017-12-14 12:50:20 -08:00
kumavis
161aa66cb4 Revert "Revert "network - for infura networks use the infura block tracker provider"" 
This reverts commit 5df7dcd758.
 2017-12-13 18:57:27 -08:00
kumavis
adb3de5283 Merge branch 'master' of github.com:MetaMask/metamask-plugin into infura-block-tracker 2017-12-13 18:56:27 -08:00
kumavis
222e80dbbe deps - bump eth-json-rpc-infura 2017-12-13 18:43:12 -08:00
Frankie
5df7dcd758
Revert "network - for infura networks use the infura block tracker provider" 2017-12-13 17:46:56 -08:00
kumavis
33e6befdaa network - for infura networks use the infura block tracker provider 2017-12-13 13:51:36 -08:00
Dan Finlay
1ebd5140aa Version 3.13.2 2017-12-09 20:00:54 -05:00
Dan
ec6c3c33bd Merge branch 'master' into NewUI-flat-merge-with-master 2017-12-06 21:11:52 -08:00
Thomas Huang
c30b543a80
Merge pull request #2630 from MetaMask/i2624-VersionedNotices 
Versioned notices
 2017-11-29 17:25:10 -06:00
kumavis
327651e7fb Merge branch 'master' of github.com:MetaMask/metamask-plugin into reload-fix 2017-11-29 08:27:47 -10:00
Dan Finlay
f0f6bb28e0 Get notice version filtering working nicely 2017-11-28 15:16:04 -08:00
kumavis
f64bc3c01a deps - obs-store@3 + migrate stream plumbing 2017-11-28 11:09:18 -10:00
Thomas Huang
2b1f2557c7
Merge pull request #2615 from jpclark/NewUI-flat 
Provide blockie identicon option
 2017-11-28 13:58:06 -06:00
Dan Finlay
e89f82399f Add optional version field to notices 
Allows notices to only show to users who are on a certain version.
 2017-11-28 11:14:57 -08:00
Thomas Huang
698e9ba441 Update greenkeeper deps for master 2017-11-27 13:49:49 -06:00
Thomas Huang
9b25f89728 Update babelify to 8.0.0 2017-11-27 12:35:19 -06:00
Jason Clark
a34362b776 Fixes changes requested in pullrequestreview-79088534 2017-11-27 08:11:48 -07:00
Thomas Huang
109050817a Update react, react-dom, and react-test-renderer to 15.6.2 2017-11-27 08:46:47 -06:00
Thomas Huang
1ee91a51cc Update ethjs-query to v0.3.1 2017-11-26 10:46:28 -06:00
Thomas Huang
178b657c75 Update Qunit to QunitJS v2.4.1 2017-11-26 10:03:17 -06:00
Thomas Huang
cefe6cded6 Update to Enzyme 3.2.0 2017-11-25 18:37:12 -06:00
Jason Clark
1b89ceb63a swapped out ethereum-blockies lib for MEW blockies library, tightened up identicon.js code 2017-11-25 14:33:42 -07:00
Jason Clark
dc7bd3c628 incremental commit of working blockie component 2017-11-24 13:48:56 -07:00
Jason Clark
fc46a16a32 toggle wired up to preferences property store 2017-11-24 10:35:17 -07:00
Clark, Jason (Contractor)
90fc4812bc incremental commit 2017-11-23 18:33:44 -07:00
greenkeeper[bot]
fac516e5eb fix(package): update react-markdown to version 3.0.0 2017-11-20 09:08:48 +00:00
frankiebee
08867874cc Merge remote-tracking branch 'origin/uat' into mascara-first-screen 2017-11-07 12:29:47 -05:00
Dan
acc973d543 Update classnames for integration tests and add output/index.css to integration test for ci 2017-11-02 15:16:43 -07:00
Dan
b7653e8207 Get current NewUI-flat tests working. 2017-11-02 15:16:43 -07:00
Dan
56e9f98bd0 More lint fixes 2017-11-02 09:45:59 -02:30
frankiebee
5f7bc85c3d fix mascara build 2017-10-31 14:02:27 -05:00
Chi Kei Chan
301c737bbc Merge branch 'master' into NewUI-flat 2017-10-24 16:56:49 -07:00
Kevin Serrano
1767dceba4 Merge pull request #2422 from watilde/fixes-lint 
Fixes lint warnings
 2017-10-24 16:53:54 -07:00
Chi Kei Chan
7c20011023 Merge branch 'master' into NewUI-flat 2017-10-24 16:50:25 -07:00
tmashuang
91b23246cd Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin into firsttimeflow 2017-10-24 08:36:02 -07:00
Kevin Serrano
721019bc2b
Temporarily reversal of json-rpc-engine 2017-10-21 14:47:12 -07:00
Daijiro Wachi
c1eb8f16dc Add lint:fix command to gulp and npm-scripts 2017-10-21 21:04:24 +02:00
Chi Kei Chan
5484e68896 Add Integration Tests 2017-10-20 21:51:37 -07:00
Chi Kei Chan
ac50db52a9 Fix linter 2017-10-20 21:51:37 -07:00
Chi Kei Chan
5aaa2d679b Add ShapeShift UI 2017-10-20 21:51:37 -07:00
Chi Kei Chan
c6a3d00d80 Fix merge conflict; separate onboarding buy screen 2017-10-20 21:51:37 -07:00
Chi Kei Chan
e88baff2ee Add missing presets 2017-10-20 21:51:37 -07:00
Jacky Chan
638bbe0428 Shuffle tokens 2017-10-20 21:51:37 -07:00
Jacky Chan
1a9b217558 Add BackupPhraseScreen 2017-10-20 21:51:37 -07:00
Jacky Chan
e1497fafa6 Add UniqueImageScreen 2017-10-20 21:51:37 -07:00
kumavis
61e1b821d4 Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-fix-maybe 2017-10-20 12:31:40 -07:00
kumavis
8472ca406a deps - bump eth-json-rpc-filters for log filter fix 2017-10-20 12:29:12 -07:00
Chi Kei Chan
344b467d03 Merge branch 'master' into NewUI-flat 2017-10-20 11:05:10 -07:00
Thomas Huang
c24e266118 Merge branch 'master' into i2348-SelectAccountOnNewVault 2017-10-20 09:04:57 -04:00
Chi Kei Chan
69d8359639 Update eth-keyring-controller dependency 2017-10-19 17:48:45 -07:00
Dan Finlay
942de9ba02 Patch sandwich-expando for security update 2017-10-19 09:47:48 -07:00
Chi Kei Chan
c8c773d641 Merge branch 'NewUI-flat' into merge 2017-10-18 22:58:46 -07:00
kumavis
209db9ae5f deps - bump eth-json-rpc-filters 2017-10-18 19:53:48 -07:00
Dan Finlay
21bde66e16 Remove account-tracker from keyringController 2017-10-18 17:14:26 -07:00
Kevin Serrano
5bdee96e73 Merge pull request #2368 from MetaMask/greenkeeper/react-simple-file-input-2.0.0 
Update react-simple-file-input to the latest version 🚀
 2017-10-18 17:10:30 -07:00
kumavis
8da0d0b28a Revert "NetworkController refactor for new EthClient interface" 2017-10-18 15:09:32 -07:00
Kevin Serrano
d9f5e6beb2 Merge pull request #2370 from MetaMask/MoveOutEtherscanLinkGeneration 
Move etherscan link logic into module
 2017-10-16 11:31:05 -07:00
Dan Finlay
c77bc5d408 Bump version on eth-simple-keyring 
Fixes bug where imported accounts could not use the new `signTypedData` method.
 2017-10-16 04:12:51 -07:00
Dan Finlay
06094c914b Move etherscan link logic into module 2017-10-14 11:23:44 -04:00
greenkeeper[bot]
970fbd797a fix(package): update react-simple-file-input to version 2.0.0 2017-10-14 12:05:00 +00:00
greenkeeper[bot]
19c375fa69 fix(package): update metamascara to version 2.0.0 2017-10-13 19:22:02 +00:00
Dan
7ec77e0b45 Refactor amount input: dynamic input width with vanilla js. 2017-10-12 11:09:05 -07:00
Dan
ea7926c211 Adds amount and gas field to sendV2. 2017-10-12 11:09:05 -07:00
kumavis
5c5f9297f7 deps - bump eth-rpc-client for fix 2017-10-11 18:36:25 -07:00
kumavis
4096ec9f69 deps - bump eth-json-rpc-middleware for fix 2017-10-10 20:20:12 -07:00
kumavis
0f8d7dacb1 network-controller - use obj-proxy for providerProxy 2017-10-10 17:26:44 -07:00
kumavis
efa92a7fc5 network controller - refactor to use eth-rpc-client 2017-10-10 14:13:12 -07:00
Sergey Ukustov
a1696f89a8 Validate data format for eth_signTypedData 2017-10-07 00:38:13 +03:00
Dan Finlay
c821a6b93a Bump provider-engine for better sender validations 2017-10-05 14:48:40 -07:00
Dan Finlay
176d03b2e8 Require keyring-controller 2.1.0 2017-10-05 14:39:23 -07:00
Dan Finlay
88686a3968 Enforce 0x prefix on accounts with new hd keyring 2017-10-04 15:35:46 -07:00
kumavis
23bc92a8f1 deps - bump eth-json-rpc-filters for log filter fix 2017-10-04 13:33:50 -07:00
Chi Kei Chan
bd99bc2e88 Merge branch 'master' into NewUI-flat 2017-10-03 16:02:58 -07:00
Thomas Huang
f12504cd09 Merge pull request #2209 from MetaMask/greenkeeper/coveralls-3.0.0 
Update coveralls to the latest version 🚀
 2017-10-03 12:35:25 -07:00
greenkeeper[bot]
98641f6f66 chore(package): update mocha to version 4.0.0 2017-10-03 04:33:04 +00:00
kumavis
e682611301 deps - bump pe for block cache fix 2017-10-02 11:35:26 -07:00
Chi Kei Chan
67ee5b21e6 Query for gas estimates 2017-09-28 17:39:53 -07:00
greenkeeper[bot]
f69cf1670f chore(package): update coveralls to version 3.0.0 2017-09-28 17:02:58 +00:00
Chi Kei Chan
5a1d50cd43 Merge branch 'master' into mmn 2017-09-27 22:32:07 -07:00
kumavis
cdf41c2857 Merge pull request #2124 from MetaMask/breakout-mascara 
require metamascara
 2017-09-27 16:27:01 -07:00
Dan Finlay
112c223930 Merge pull request #2196 from MetaMask/express-bump 
deps - bump express for security fix
 2017-09-27 15:26:53 -07:00
kumavis
cd0f44e2d6 deps - bump express for security fix 2017-09-27 14:59:10 -07:00