1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-29 15:50:28 +01:00
Commit Graph

226 Commits

Author SHA1 Message Date
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
bec1eeaf68 update package-lock.json 2018-07-21 13:12:50 -04:00
brunobar79
f309b1012c update package-lock.json 2018-07-21 12:48:40 -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
359a888a60 update package-lock.json 2018-07-13 00:44:19 -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
a2d9c43fba Various fixes from PR comments 2018-07-06 16:27:08 -07: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
a279748c2e package-lock update 2018-07-03 17:56:30 -04:00
brunobar79
3837c2ddd7 fix merge conflicts 2018-07-03 15:41:18 -04:00
brunobar79
13b03ec090 fix lint errors 2018-07-03 14:29:36 -04:00
brunobar79
160bc4daa4 ignore lodash vulnerability 2018-07-03 13:46:50 -04:00
brunobar79
3290421e2f fix merge conflicts 2018-07-03 13:31:30 -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
0b2db451ee Update package-lock.json 2018-06-27 13:30:55 -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
kumavis
e9cb650832 Merge branch 'develop' of github.com:MetaMask/metamask-extension into ValidateEmptyKey 2018-06-13 21:11:04 -07:00
Bruno
bb4cc72646 fix merge conflicts 2018-06-13 02:01:47 -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
Dan Finlay
b24efcb1cd Make account import tests much more specific
However, they no longer seem to work. I'm unclear why this test is
failing. The private key being provided should be valid.
2018-06-11 14:58:05 -07:00
Bruno
8c4d58aa45 initial trezor support 2018-06-10 03:52:32 -04:00
Dan
aee9247faa Merge branch 'develop' into i3725-refactor-send-component- 2018-06-04 22:32:30 -02:30
kumavis
a3cc2b0a7b deps - update package-lock via npm@5.10.0 2018-06-03 12:29:19 -07:00
bitpshr
ccae937f41 Properly end the middleware stack on RPC error 2018-06-01 12:57:57 -04:00
Dan
d12bb8c14f Merge branch 'i3725-refactor-send-component-' of github.com:MetaMask/metamask-extension into i3725-refactor-send-component- 2018-05-31 15:29:17 -02:30
Dan
5091b03e4b Merge branch 'develop' into i3725-refactor-send-component- 2018-05-31 15:28:03 -02:30
Dan
6d8344d0d0 Update amount error on update of send screen. 2018-05-30 20:51:46 -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
Dan
f33bb3e2fd Stop using external NumericInput component. 2018-05-29 16:25:03 -02:30
Dan
ea28c8a437 Replaces currency-input.js with NumericInput 2018-05-29 09:21:54 -02:30
kumavis
1cd4b03b37 test - unit - fail if tests contain a .only call 2018-05-25 12:58:16 -07:00
Whymarrh Whitby
f5cefbbeda fix: Why does npm insist on reordering the lockfile? 2018-05-24 23:23:42 -02:30
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
d45fe6fc72 Merge branch 'develop' of https://github.com/Jabher/metamask-extension into Jabher-develop 2018-05-21 13:59:23 -07:00
Alexander Tseung
4f6b53c1aa Update designs for Add Token screen 2018-05-19 23:04:19 -07:00
Whymarrh Whitby
805c6158a4 Update eth-keyring-controller dependency 2018-05-17 12:57:39 -02:30
bitpshr
ce2834400c Add new json-rpc-engine middleware for improved error handling 2018-05-14 08:33:47 -04:00
Alexander Tseung
2381c0e0f4 Add new unlock screen design 2018-05-11 12:49:17 -07:00
Thomas
3632ea29cc Merge branch 'develop' into e2e-tests 2018-05-11 10:13:44 -07:00
Alexander Tseung
b7029a17a1 Update lodash 2018-05-09 21:33:37 -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
b354af501c Bump package lock 2018-05-03 14:12:44 -07: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
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
1a60f42933 deps - package-lock 2018-04-27 18:17:31 -07:00
kumavis
e01b81ed9b deps - package-lock 2018-04-27 17:19:46 -07:00
Paul Bouchon
1bad3fa257
Allow transactions with 0-gwei gas price (#4073)
* Allow transactions with 0-gwei gas price
* Add tests to verify tx with 0 gas fee
* Conditionally use CurrencyInput in CurrencyDisplay
2018-04-27 10:42:02 -04:00
kumavis
1c63b11e3f rpc - bump provider-engine + eth-json-rpc-filters 2018-04-25 14:02:41 -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
kumavis
c120fbdfb9 deps - bump sentry for more detailed fetch failure 2018-04-23 10:20:40 -07: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
7129d7c0f3 Require loglevel singleton in each module that uses it 2018-04-13 17:56:28 -04: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
Dan
2c4426e4de Merge branch 'master' into i3580-InternationalizeCurrency 2018-04-09 16:52:26 -02:30
Alexander Tseung
34e608e9dc Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-04-03 17:06:00 -07:00
Alexander Tseung
bf38aa6f1d Fix transaction confirmations 2018-04-03 16:59:32 -07:00
Dan Finlay
74049c19fc Internationalize currency
Fixes #3580
2018-04-03 13:58:26 -07:00
kumavis
92dd2b3218 ci - job-publish - publish source+sourcemaps to sentry if new release 2018-04-03 12:36:46 -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
04d85fd79e deps - bump package-lock.json 2018-04-02 11:50:22 -07:00
kumavis
bd6f554766 build - use uglifyify and gulp-multi-process for better performance 2018-03-30 22:19:02 -07:00
frankiebee
5ec4286966 deps - bump proviedr-engine 2018-03-30 15:24:32 -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
2997067ca0 ci - e2e+screens - use shell-parallel to run ganache 2018-03-30 13:48:46 -07:00
Thomas
37acf5ff4f Update package-lock 2018-03-30 12:26:23 -07:00
kumavis
5945c8cf67 development - create selenium screen shotter 2018-03-30 00:09:39 -07:00
kumavis
d2874cf89a deps - update package-lock 2018-03-28 23:12:41 -07:00
kumavis
42d0b5f0ed deps - update pakage-lock 2018-03-28 21:35:59 -07:00
kumavis
c171ea0632 deps - bump ethjs-query to fix unhandled promise rejections 2018-03-28 09:40:11 -07:00
kumavis
f2927121d4 deps - update package-lock (maybe greenkeeper forgot?) 2018-03-28 09:38:38 -07:00
kumavis
4ee48acf56 deps - update package-lock 2018-03-27 14:30:50 -07:00
kumavis
c2b5538ff3 deps - update package-lock 2018-03-27 13:54:32 -07:00
Thomas Huang
8648aee907
Merge branch 'master' into selenium-e2e 2018-03-27 13:28:58 -07: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
Thomas
d646f37741 Merge branch 'master' into selenium-e2e 2018-03-21 12:25:41 -07:00
Viet Le
0dd2f918b3 corrected vn -> vi 2018-03-17 20:49:19 +00:00
Thomas
6306c7b190 Merge branch 'master' into selenium-e2e 2018-03-14 13:29:47 -07:00
kumavis
9378ac5d62 deps - update package-lock 2018-03-13 11:35:53 -07:00
Thomas
c18f2a17fc Add selenium-webdriver and chromedriver 2018-03-09 23:57:03 -08:00
kumavis
25f147cc4b deps - update package-lock 2018-03-09 11:58:37 -08:00
kumavis
b4a686a5c6 deps - bump pump 2018-03-09 11:51:03 -08:00
kumavis
4af2066298 meta - add package-lock to git 2018-03-08 16:20:23 -08:00
kumavis
e8d5d85a16 gitignore - remove cached package-lock 2017-06-12 13:34:02 -07:00
Dan Finlay
d59021f754 Version 3.7.3 2017-06-01 10:18:20 -07:00