634 Commits

Author	SHA1	Message	Date
bitpshr	4780f825b1	Add ComposableObservableStore for subscription management	2018-04-13 10:20:44 -04: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	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
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	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