Alexander Tseung
2fa554a641
Fix conf-tx render
2018-03-30 17:37:24 -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
3def45004a
transactions#newUnapprovedTransaction - dont default origin to metamask
2018-03-30 16:00:11 -07:00
Frankie
641171eae3
Merge pull request #3806 from MetaMask/build-dev-fix
...
build - properly set GULP_METAMASK_DEBUG on dev
2018-03-30 15:50:00 -07:00
frankiebee
03b123a85d
transactions - put the origing on the txMeta to help with debugging
2018-03-30 15:48:39 -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
Alexander Tseung
bdc4a6964a
Fix merge conflicts. Refactor renderPrimary into Home component
2018-03-30 15:07:00 -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
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
kumavis
4606a23c3f
build - refactor scss compilation into single config
2018-03-29 21:28:35 -07:00
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
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
kumavis
211a4d4419
Merge pull request #3786 from FBrinkkemper/patch-1
...
changed zaad -> back-up woorden
2018-03-29 10:15:38 -07:00
Alexander Tseung
ef61ef2ce8
Fix i18n merge conflicts
2018-03-29 09:37:29 -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
FBrinkkemper
1b2674119e
changed zaad -> back-up woorden
...
Zaad sounds strange in Dutch. Back-up woorden (back-up words) are a better translation in Dutch. Back-up is also a Dutch phrase, like it is in English.
2018-03-29 12:30:59 +02:00
kumavis
93c123c6f5
ci - build:announce - fix links to extension builds
2018-03-29 00:34:01 -07:00
kumavis
001595b2b9
ci - build:announce - fix link
2018-03-29 00:24:50 -07:00
kumavis
ec608cb1b0
ci - build:announce - link all builds
2018-03-29 00:17:14 -07:00
kumavis
93ac72801a
ci - artifacts - upload extension builds, dont upload extension source
2018-03-28 23:47:11 -07:00
kumavis
e7f655ec6d
npm scripts - simplify and speed up dist builds
2018-03-28 23:45:33 -07:00
kumavis
399381f9d2
ci - upload whole dist + fix announce mascara url
2018-03-28 23:26:58 -07:00
kumavis
085e7d7dec
ui - fix typo in settings
2018-03-28 23:19:07 -07:00
