3290421e2f
fix merge conflicts
2018-07-03 13:31:30 -04:00
1f0cf11af1
Merge pull request #4712 from MetaMask/lint-fix
...
Lint - Lint all the things (without conflicts!)
2018-07-03 09:40:25 -07:00
cc11a62397
remove gulp eslint and cleanup gulpfile
2018-07-02 18:35:53 -04:00
4b45dd4ed0
point eth-contract-metadata to repo master
2018-07-02 18:29:22 -04:00
85fd75c21f
update package-lock.json
2018-07-02 17:03:20 -04:00
9b0bc67066
fix merge conflicts
2018-07-02 15:29:26 -04:00
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
66b3b72c98
use latest eth-keyring-controller
2018-07-01 12:00:04 -10:00
1494cc5e6c
fix merge conflicts
2018-07-01 11:41:34 -10:00
f824a2982a
Use supersonic instead of httpserver to serve local dapp (e2e beta tests)
2018-06-28 10:16:36 -02:30
c343a12543
Use locally served dapp to test contract calls in e2e beta tests
2018-06-27 11:08:15 -02:30
6e563acd93
use latest eth-trezor-keyring
2018-06-25 12:24:58 -10:00
87dfca0767
fixes
2018-06-23 02:52:11 -04:00
4381d3e71d
point to new version of eth-trezor-keyring
2018-06-22 23:25:19 -04:00
ac8b56a00d
notices - notices collection is now manually edited
2018-06-13 22:56:46 -07:00
bb4cc72646
fix merge conflicts
2018-06-13 02:01:47 -04:00
fe3d81cfd8
upgrade eth-trezor-keyring
2018-06-13 01:44:53 -04:00
8763ea898e
move TrezorKeyring to its own package
2018-06-13 01:32:13 -04:00
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
8c4d58aa45
initial trezor support
2018-06-10 03:52:32 -04:00
f90d070190
Merge branch 'develop' into portal-metamask
2018-06-01 15:41:18 +08:00
5091b03e4b
Merge branch 'develop' into i3725-refactor-send-component-
2018-05-31 15:28:03 -02:30
b69da50095
deps - bump eth-keyring-controller for bugfix
2018-05-30 14:29:14 -07:00
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
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
d6965c7cdb
deps - bump eth-keyring-controller + update package-lock
2018-05-29 17:38:00 -07:00
695b157e7b
Intergrate ENS with IPFS
2018-05-29 12:38:25 +08:00
1cd4b03b37
test - unit - fail if tests contain a .only call
2018-05-25 12:58:16 -07:00
715624227a
Add basic e2e tests for the new UI
2018-05-24 23:23:42 -02:30
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
440905125d
Merge branch 'develop' into i3725-refactor-send-component-
2018-05-23 16:03:15 -02:30
cee55b47d0
Merge pull request #4321 from MetaMask/testing
...
MM controller tests and reorganizing test files
2018-05-22 13:02:41 -07:00
b5bbfd3264
Merge pull request #4308 from MetaMask/i4232-addtoken
...
Update designs for Add Token screen
2018-05-22 12:53:59 -07:00
1fbf59cdd3
ci - screens - continue screenshots through account creation + export account
2018-05-22 01:56:52 -07:00
238f2eb179
Merge branch 'develop' into testing
2018-05-21 16:36:48 -07:00
848f8f805b
Merge branch 'develop' into testing
2018-05-21 15:14:47 -07:00
7a65c22a02
Merge branch 'develop' into ci-publish-release
2018-05-21 14:58:37 -07:00
58b9afff4f
Merge branch 'develop' into testing
2018-05-21 14:57:57 -07:00
d45fe6fc72
Merge branch 'develop' of https://github.com/Jabher/metamask-extension into Jabher-develop
2018-05-21 13:59:23 -07:00
08d95bbafa
Merge pull request #4034 from whymarrh/account-nicknames
...
Move account names out of KeyringController
2018-05-21 13:44:07 -07:00
554a10f17e
Merge branch 'develop' into testing
2018-05-21 13:05:24 -07:00
4f6b53c1aa
Update designs for Add Token screen
2018-05-19 23:04:19 -07:00
59c9852999
ci - add docs publish to job-publish-release
2018-05-18 14:03:02 -07:00
805c6158a4
Update eth-keyring-controller dependency
2018-05-17 12:57:39 -02:30
5e80bc4cb9
Merge branch 'develop' into testing
2018-05-16 22:47:07 -07:00
759bc17388
Merge branch 'develop' into i3725-refactor-send-component-
2018-05-15 11:21:15 -02:30
517be35ab6
Merge branch 'develop' into e2e-tests
2018-05-14 17:19:44 -07:00
cd42d18203
Merge e2e tests into one
2018-05-14 17:17:36 -07:00
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
6bc8cc819a
Merge branch 'develop' into i3725-refactor-send-component-
2018-05-14 11:44:50 -02:30
2381c0e0f4
Add new unlock screen design
2018-05-11 12:49:17 -07:00
f7205e5cc7
fix(package): update ethjs to version 0.4.0
2018-05-11 18:15:10 +00:00
3632ea29cc
Merge branch 'develop' into e2e-tests
2018-05-11 10:13:44 -07:00
f98aec5f50
Update deep-extend and sshpk
2018-05-09 18:52:35 -07:00
26c6bddebf
Merge branch 'develop' into e2e-tests
2018-05-08 13:10:26 -07:00
28126f60f3
bump extensionizer version to 1.0.1 (see https://github.com/MetaMask/extensionizer/pull/4 )
2018-05-08 16:47:18 +03:00
8250fd9d6d
Merge branch 'develop' into testing
2018-05-07 14:30:43 -07:00
7c49009854
Unit tests for containers, utils and selectors in send_/
2018-05-05 11:58:14 -04:00
f900821a42
Merge branch 'develop' into e2e-tests
2018-05-03 14:10:26 -07:00
d5759cf4a8
Add storybook integration
2018-05-03 10:51:15 -07:00
3b229775a8
Remove eth-block-tracker package
2018-05-02 14:06:34 -07:00
3e4f158b34
Pin chromedriver version to 2.36.0
2018-05-02 13:10:21 -07:00
65253e114f
Adds nsp check to CircleCI tests
2018-05-02 12:01:03 -07:00
2c95390229
Adds sass-loader and style-loader packages for storybook integration
2018-05-01 20:05:14 -07:00
a70da53340
Adds path and resolve-url-loader packages for storybook integration
2018-05-01 19:32:20 -07:00
4a54deadf9
Adds css-loader and file-loader needed for storybook integration
2018-05-01 14:28:33 -07:00
9dfe4f410d
Firefox
2018-05-01 12:18:22 -07:00
9b1c07c750
Merge pull request #4111 from MetaMask/build-fix-sourcemaps
...
Build - fix sourcemaps
2018-04-30 10:44:38 -07:00
f4fe3e81c1
development - add sourcemap debug tool
2018-04-27 18:17:21 -07:00
5c9cb0b787
build - minify via gulp-uglify-es instead of uglifyify
2018-04-27 18:15:50 -07:00
b487dab2e7
test - unit - use ganache instead of deprecated block-tracker test util
2018-04-27 17:11:44 -07:00
1c63b11e3f
rpc - bump provider-engine + eth-json-rpc-filters
2018-04-25 14:02:41 -07:00
91161739a5
Move uglifyify to MetaMask org
2018-04-25 10:46:01 -07:00
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
629457ea54
setupUntrustedCommunication and setupTrustedCommunication
2018-04-24 13:33:31 -07:00
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
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
c120fbdfb9
deps - bump sentry for more detailed fetch failure
2018-04-23 10:20:40 -07:00
49e02baea0
fix(package): update ethjs-contract to version 0.2.0
2018-04-18 22:09:40 +00:00
e77dbaa0dc
deps - update keyring controller and other eth-dependinces
2018-04-17 14:39:02 -07:00
6ee57dcad7
Merge branch 'master' into i3580-InternationalizeCurrency
2018-04-17 13:36:21 -07:00
7b70804aa0
Merge pull request #3969 from MetaMask/i3966-AddJsDocsPage
...
Add JSDocs Page and Script
2018-04-17 10:01:09 -07:00
4780f825b1
Add ComposableObservableStore for subscription management
2018-04-13 10:20:44 -04:00
136caa2034
Add JSDocs Page and Script
...
Includes new script `npm run doc` for generating docs page.
2018-04-12 14:46:05 -07:00
f15b81089e
Merge branch 'master' into i3580-InternationalizeCurrency
2018-04-10 02:13:05 -07:00
df1f891585
Merge branch 'master' into i3621-LogoPerformance
2018-04-09 13:56:59 -07:00
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
2a3e634ab9
package.json - update engines field to require node v8.x.x
2018-04-09 13:40:15 -07:00
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
2c4426e4de
Merge branch 'master' into i3580-InternationalizeCurrency
2018-04-09 16:52:26 -02:30
743fb13472
fix(package): update ethjs to version 0.3.4
2018-04-06 23:04:44 +00:00
2bfd3de52b
fix(package): update gulp-sass to version 4.0.0
2018-04-05 15:51:26 +00:00
34e608e9dc
Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254
2018-04-03 17:06:00 -07:00
74049c19fc
Internationalize currency
...
Fixes #3580
2018-04-03 13:58:26 -07:00
931ce12073
Improve fox logo performance
...
By including metamask-logo@2.1.4
Fixes #3621
2018-04-03 13:53:02 -07:00
92dd2b3218
ci - job-publish - publish source+sourcemaps to sentry if new release
2018-04-03 12:36:46 -07:00
00657e14a8
build - correctly set METAMASK_ENV via envify
2018-04-03 09:51:33 -07:00
2e9273d2ac
Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254
2018-04-03 01:03:51 -07:00
35875863d2
Fix merge conflicts. Modify send workflow
2018-04-03 01:03:31 -07:00
655593ea62
Merge branch 'master' of github.com:MetaMask/metamask-extension into build-perf
2018-04-02 16:28:33 -07:00
brunobar79
kumavis
Esteban MIno
Bruno Barbieri
Dan
kumavis
Dan Finlay
PhyrexTsai
MikeCheng1208
Whymarrh Whitby
tmashuang
Alexander Tseung
greenkeeper[bot]
jabher
Frankie
Thomas
Dan Finlay
Thomas Huang
bitpshr