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
