6617 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alexander Tseung	5561937773	Fix account and network dropdowns in confirm screen	2018-05-14 15:03:04 -07:00
Frankie	6bd1b21d3b	Merge pull request #4190 from MetaMask/i3614-unlock ... Add new unlock screen design	2018-05-12 10:02:39 -07:00
Alexander Tseung	0301b33a48	Add TextField component to storybook	2018-05-11 12:49:17 -07:00
Alexander Tseung	2381c0e0f4	Add new unlock screen design	2018-05-11 12:49:17 -07:00
kumavis	76ab5c04fa	Merge pull request #4226 from MetaMask/e2e-tests ... E2E tests	2018-05-11 12:46:53 -07:00
Thomas	3632ea29cc	Merge branch 'develop' into e2e-tests	2018-05-11 10:13:44 -07:00
Orange	bfc19e403b	Chinese translation Enhancements (#4218)	2018-05-11 10:09:14 -07:00
kumavis	4e96ca3081	Merge pull request #4231 from MetaMask/fix-nodesecurity ... Fix Node Security vulnerability warnings	2018-05-11 09:07:59 -07:00
Thomas	d9d528753d	Increase timeout	2018-05-10 10:47:48 -07:00
Thomas	c37ad657cd	Fix typo	2018-05-10 10:32:41 -07:00
Thomas	60933f1090	Job Screens with Shadow Dom Css selector	2018-05-10 10:24:27 -07:00
Thomas	68bbe18e32	Multistep Shadow Dom Query Selector for local extension id	2018-05-10 09:47:34 -07:00
Alexander Tseung	c9c56bcaec	Add advisory #157 to .nsprc	2018-05-10 09:03:25 -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
Dan Finlay	f17dc5f452	Merge pull request #4214 from MetaMask/tx-controller-doc-typo ... Fix documentation error	2018-05-08 18:37:57 -04:00
Thomas	26c6bddebf	Merge branch 'develop' into e2e-tests	2018-05-08 13:10:26 -07:00
Thomas Huang	c3079ff160	Merge pull request #4196 from MetaMask/i3457-fontweight ... Change font weight from 300 to 400	2018-05-08 12:46:27 -07:00
Thomas Huang	4177d09664	Merge pull request #4099 from MetaMask/i4043-storybook-dev2 ... Add storybook integration	2018-05-08 12:45:40 -07:00
Thomas	d59105299a	Update test:screens to newest chrome extension list	2018-05-08 07:30:05 -07:00
Thomas	6c9b303dbd	Merge branch 'develop' into e2e-tests	2018-05-08 07:11:29 -07:00
Thomas	f7a3d8887c	Update to extension Id path for new chrome	2018-05-08 07:03:17 -07:00
Alexander Tseung	f70652c83a	Add storybook README.md file	2018-05-07 13:22:29 -07:00
bitpshr	6351b7bb88	Fix documentation typo	2018-05-07 15:08:43 -04:00
Filip Š	caf5a6c15c	Fix Slovenian translation (#4189)	2018-05-07 15:05:34 -04:00
kumavis	0e525370fc	Merge pull request #4163 from MetaMask/check-nonce-ussage ... Check nonce ussage	2018-05-07 10:48:27 -07:00
Alexander Tseung	fff7f52074	Change font weight from 300 to 400	2018-05-05 15:12:41 -07:00
Thomas	228e06110d	Remove waiting for button to be enabled TOU	2018-05-03 16:11:05 -07:00
Thomas	025d8e7983	Merge branch 'e2e-tests' of https://github.com/tmashuang/metamask-extension into e2e-tests	2018-05-03 14:38:49 -07:00
Thomas	1d353c002d	Increase timeout for TOU scroll	2018-05-03 14:37:56 -07:00
Thomas	23e1290e27	Add a comment on the confirmation transaction metamask popup showing blank, but button still renders	2018-05-03 14:18:06 -07:00
Thomas	10baffaf48	Quit chromedriver after test	2018-05-03 14:14:02 -07: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
Thomas	9bba97a676	Reduce delay for installing firefox addon	2018-05-03 13:26:48 -07:00
Thomas	74e36e6f8f	Add Timeouts for driver.wait	2018-05-03 13:18:54 -07:00
Thomas	8d9d55fec3	Test wit driver.wait	2018-05-03 13:06:36 -07:00
Alexander Tseung	d5759cf4a8	Add storybook integration	2018-05-03 10:51:15 -07:00
kumavis	096851d091	Merge pull request #4156 from MetaMask/i4010-spinner ... Fix styling of the app spinner	2018-05-02 17:00:57 -07:00
kumavis	4049e3836c	Merge pull request #4173 from MetaMask/chromedriver ... Pin chromedriver version to 2.36.0	2018-05-02 16:10:03 -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
kumavis	85bbb417f5	Merge pull request #4172 from MetaMask/nodesecurity ... Adds nsp check to CircleCI tests	2018-05-02 12:59:33 -07:00
Alexander Tseung	65253e114f	Adds nsp check to CircleCI tests	2018-05-02 12:01:03 -07:00
Thomas	5ae2b683b2	Ci Firefox	2018-05-02 10:24:50 -07:00
Frankie	0416b37ee4	Merge pull request #4166 from MetaMask/i4010-deps4 ... Adds path and resolve-url-loader packages for storybook integration	2018-05-01 20:59:05 -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
Frankie	4c40558090	Merge pull request #4164 from MetaMask/i4010-deps3 ... Adds css-loader and file-loader needed for storybook integration	2018-05-01 18:16:15 -07:00
Thomas	5e688f0781	Delay around the addon install	2018-05-01 15:24:32 -07:00