m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-26 12:29:06 +01:00
Code
8,919 Commits 2 Branches 0 Tags 265 MiB
c80b295ccc
Commit Graph

844 Commits

Author SHA1 Message Date
Whymarrh Whitby
6132238302 Remove superstatic package 
Install and uninstalling superstatic doesn't work on Node 8 at the time of
writing:

    $ npm install -D superstatic@6
    npm ERR! code ENOTSUP
    npm ERR! notsup Unsupported engine for got@5.7.1: wanted: {"node":">=0.10.0 <7"} (current: {"node":"8.11.3","npm":"6.3.0"})
    npm ERR! notsup Not compatible with your version of node/npm: got@5.7.1
    npm ERR! notsup Not compatible with your version of node/npm: got@5.7.1
    npm ERR! notsup Required: {"node":">=0.10.0 <7"}
    npm ERR! notsup Actual:   {"npm":"6.3.0","node":"8.11.3"}

This commit removes the package (using Node 6!) and it will have to be replaced.
 2018-08-06 15:47:57 -02:30
brunobar79
710b4e294f added crossbrowser support and error handling 2018-07-31 18:30:56 -04:00
brunobar79
4de8f5b0d4 fix dependencies 2018-07-26 21:37:43 -04:00
brunobar79
69f4c8c336 fix merge conflicts 2018-07-26 21:04:03 -04:00
brunobar79
d4a15f22c2 added webrtc-adapter for browser compat 2018-07-26 21:00:48 -04:00
brunobar79
ea028e7506 fully working without tweaking ext. permission 2018-07-26 20:56:58 -04:00
brunobar79
6cd4bc9f4e working without permission issues 2018-07-26 20:24:39 -04:00
Antoine Nauleau
653e42cf79 Update Babel to Current Standard "babel-preset-env" (#4812) 
* Update .babelrc and package.json to babel-preset-env standard

* Install babel-preset-env babel-stage-0

* Regenerate package-lock.json by running npm install --package-lock-only && npm audit fix

* Resolve PR #4812 merge conflicts

* Merge #4847 Solves previous cache issues with cirlce-ci
 2018-07-24 15:21:32 -02:30
brunobar79
2e50348241 added instascan pkg 2018-07-23 17:11:51 -04:00
brunobar79
cde91fac16 added node version requirements 2018-07-21 12:43:35 -04:00
brunobar79
de21a49265 use latest keyring packages 2018-07-16 15:31:05 -04:00
brunobar79
5710e648bd remove account modal updated 2018-07-12 18:19:33 -04:00
brunobar79
4b528405ea catching up with develop 2018-07-12 13:19:51 -04:00
brunobar79
07d8bfaec5 Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support 2018-07-12 12:54:08 -04:00
brunobar79
89cc48789a update to temp dependencies 2018-07-11 20:01:44 -04:00
Alexander Tseung
7d691c7398 Fix existing unit tests 2018-07-07 18:53:00 -07:00
brunobar79
64e397a6f1 update package-lock.json 2018-07-06 20:04:31 -04:00
Alexander Tseung
9cde5ab11b Use eth-method-registry to get method data 2018-07-06 16:27:08 -07:00
Alexander Tseung
ea9d51e427 Refactor and redesign confirm transaction views 2018-07-06 16:27:08 -07:00
brunobar79
7c9d942ba1 Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support 2018-07-06 19:21:18 -04:00
brunobar79
986bb74501 package.json updated and tests passing 2018-07-03 20:24:21 -04:00
brunobar79
d382f89989 tests are passing 2018-07-03 20:21:01 -04:00
brunobar79
595447ccac Merge remote-tracking branch 'upstream/develop' into HEAD 2018-07-03 14:21:17 -04:00
brunobar79
3290421e2f fix merge conflicts 2018-07-03 13:31:30 -04:00
kumavis
1f0cf11af1
Merge pull request #4712 from MetaMask/lint-fix 
Lint - Lint all the things (without conflicts!)
 2018-07-03 09:40:25 -07:00
brunobar79
cc11a62397 remove gulp eslint and cleanup gulpfile 2018-07-02 18:35:53 -04:00
Esteban MIno
4b45dd4ed0 point eth-contract-metadata to repo master 2018-07-02 18:29:22 -04:00
brunobar79
85fd75c21f update package-lock.json 2018-07-02 17:03:20 -04:00
brunobar79
9b0bc67066 fix merge conflicts 2018-07-02 15:29:26 -04:00
Bruno Barbieri
4c86f25f5b npm 6 fresh lock + node 8 (#4675) 
* run npm install with npm 6 and node 8
* npm audit fix --force
* bump node version on circleci docker img
* bump lodash
 2018-07-02 10:30:56 -07:00
brunobar79
66b3b72c98 use latest eth-keyring-controller 2018-07-01 12:00:04 -10:00
brunobar79
1494cc5e6c fix merge conflicts 2018-07-01 11:41:34 -10:00
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