1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Commit Graph

6318 Commits

Author SHA1 Message Date
kumavis
7dde948c45 Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens 2018-03-30 13:57:50 -07:00
kumavis
32bb09bcb9 test - e2e - set network to localhost 2018-03-30 13:52:42 -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
37acf5ff4f Update package-lock 2018-03-30 12:26:23 -07:00
Thomas
43c402227d Ganache:start script with seed phrase 2018-03-30 11:51:51 -07:00
kumavis
b014133fdc development - screens - use localhost for network 2018-03-30 11:16:08 -07:00
Thomas Huang
8e0f39353d
Merge pull request #3781 from MetaMask/ci-artifacts
Build - Refactor + CircleCI Mascara builds
2018-03-30 11:15:12 -07:00
kumavis
5f1f345a5d network - use providerType for localhost 2018-03-30 10:59:39 -07:00
kumavis
b2f02300a3 ci - run screenshotter 2018-03-30 01:01:16 -07:00
kumavis
0d27d27efa development - screenshotter - capture en locale and build gif from only en 2018-03-30 00:59:16 -07:00
kumavis
fcdfd48057 development - screenshotter - capture screens across all locales 2018-03-30 00:48:37 -07:00
kumavis
5945c8cf67 development - create selenium screen shotter 2018-03-30 00:09:39 -07:00
kumavis
89e6baa3ba clean - mascara - remove unused code 2018-03-29 23:09:31 -07:00
kumavis
99e618d3f2 mascara - server - serve bundles from dist 2018-03-29 23:06:01 -07:00
kumavis
8277c662de npm scripts - rewrite default scripts to new task names 2018-03-29 22:58:26 -07:00
kumavis
433bb0f01a build - split primary tasks into metamask + extension * dev + build 2018-03-29 22:34:59 -07:00
kumavis
edd70bd13e build - cleanup commented code 2018-03-29 22:20:24 -07:00
kumavis
7b9b890aa9 build - fix scss + js reload 2018-03-29 22:19:15 -07:00
kumavis
b2d0e9871c build - fix copy devMode 2018-03-29 21:53:38 -07:00
Dan
2be6f8bae0 Fix lint and tests 2018-03-30 02:19:04 -02:30
Dan
2979de2e6b Adds integration tests for rendering of tx list items. 2018-03-30 02:08:29 -02:30
kumavis
4606a23c3f build - refactor scss compilation into single config 2018-03-29 21:28:35 -07:00
Dan
717623e2e3 Merge branch 'master' into i3686-txparamundefined-sigrequestsintxlist 2018-03-30 00:00:31 -02:30
Dan
893f82491d Merge branch 'master' into i3471-checkbalanceonconfirmscreen 2018-03-29 23:58:45 -02:30
kumavis
77d4a9a2bb build - dev - fix js build order 2018-03-29 17:37:49 -07:00
kumavis
7067f63627 build - dev - run js tasks in parallel and set watch flag 2018-03-29 17:34:30 -07:00
kumavis
592c2e5948 test - add auto screen shotter 2018-03-29 17:02:40 -07:00
kumavis
b49ad750dd Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artifacts 2018-03-29 16:54:00 -07:00
kumavis
9d4be1842e
Merge pull request #3788 from danjm/i3787-make-t-available-via-context
i18n - Removes t from props via metamask-connect; put t on context
2018-03-29 16:52:52 -07:00
Dan
74f13c0a34 Merge branch 'master' into i3787-make-t-available-via-context 2018-03-29 21:06:27 -02:30
Dan
0a48aa84ca Add changelog entry for language selection. 2018-03-29 20:52:45 -02:30
Thomas Huang
5a0523cdfd
Merge pull request #3798 from MetaMask/e2e-selector
test - e2e - generate artifacts on test failure
2018-03-29 16:21:18 -07:00
Dan
ad603da2e7 Stopping wrapping provider children in div; stop wrapping old-ui in provider. 2018-03-29 20:16:45 -02:30
Dan
949ac352de Merge branch 'master' into i3787-make-t-available-via-context 2018-03-29 20:06:00 -02:30
kumavis
f6f8cab5dc ci - upload e2e test artifacts 2018-03-29 13:59:39 -07:00
kumavis
971204eb06
Merge branch 'master' into e2e-selector 2018-03-29 13:57:43 -07:00
kumavis
9ec42a87b3
Merge pull request #3795 from MetaMask/i3790-IncreaseSafeGasLimit
Increase safe gas limit
2018-03-29 13:55:48 -07:00
kumavis
552fb1fabe test - e2e - fix selector with extra div (?) 2018-03-29 13:54:01 -07:00
kumavis
2328b120da test - e2e - generate artifacts on test failure 2018-03-29 13:49:54 -07:00
Dan Finlay
4cd9c155db Bump changelog 2018-03-29 12:31:10 -07:00
Dan Finlay
4d2d3d4430 Increase permitted safe gas limit
Block gas limits have been incredibly stable lately:
https://etherscan.io/chart/gaslimit

And this validation has prevented Aragon's new beta from working:
https://twitter.com/izqui9/status/979373309312815104

Fixes #3790
2018-03-29 12:28:50 -07:00
Thomas Huang
49d27815f3
Merge pull request #3794 from MetaMask/e2e-selector
test - e2e - prefer css selectors over xpath
2018-03-29 12:14:33 -07:00
Thomas
53172f1b55 Better delays and fix logout css selector 2018-03-29 12:06:23 -07:00
kumavis
830b232cb9 test - e2e - prefer css selectors over xpath 2018-03-29 11:59:13 -07:00
Nico
011bdd2d6e i18n - Update German Locale 2018-03-29 11:18:49 -07:00
Dan
a4594f6838 Show insufficient funds on confirm screen on first render. 2018-03-29 15:30:03 -02:30
kumavis
211a4d4419
Merge pull request #3786 from FBrinkkemper/patch-1
changed zaad -> back-up woorden
2018-03-29 10:15:38 -07:00
Dan
0a711f0de0 Removes t from props via metamask-connect and instead places it on context via a provider. 2018-03-29 12:42:38 -02:30
Dan
01e3293b65 Ensure correct address used when rendering transfer transactions. 2018-03-29 10:32:30 -02:30