1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-27 21:00:13 +01:00
Commit Graph

6179 Commits

Author SHA1 Message Date
Thomas Huang
8cd2022169
Merge pull request #3825 from danjm/i3668-warnusertxsimulationfails
Add simulation failure errors while improve send error handling on confirm screen
2018-04-02 15:26:46 -07:00
Thomas Huang
331b62a6a2
Merge pull request #3829 from MetaMask/locales-lint
Lint locale json
2018-04-02 15:01:00 -07:00
kumavis
9867bec17e lint - i18n - ru - lint fix 2018-04-02 14:49:25 -07:00
kumavis
2b6557a024 lint - lint json files in app/ 2018-04-02 14:47:47 -07:00
kumavis
fd30fabfbd
Merge pull request #3826 from danjm/ensure-txparams-0xprefixed
Ensure txParams are prefixed with 0x when sending.
2018-04-02 14:02:25 -07:00
kumavis
f6f144643f
Merge pull request #3763 from MetaMask/i18n-helper
I18n - Improve verify locales utility
2018-04-02 13:09:59 -07:00
Dan
d166cb2b1b Ensure txParams are prefixed with 0x when sending. 2018-04-02 16:38:51 -02:30
Dan
7ccf6163fd Adds simulation failure error messages to confirm screen. 2018-04-02 16:29:35 -02:30
Dan
1dc3c51b54 UpdateSendErrors only called when balance defined, recalled if balance updates. 2018-04-02 16:26:19 -02:30
kumavis
04d85fd79e deps - bump package-lock.json 2018-04-02 11:50:22 -07:00
kumavis
0d591d8da2
Update translating-guide.md 2018-04-02 11:10:43 -07:00
kumavis
6d5f1392a5
Merge branch 'master' into i18n-helper 2018-04-02 10:47:24 -07:00
kumavis
69a867b4a4
Merge pull request #3783 from gornov/master
Modified Russian localization. resolves #3534, #3644
2018-04-02 10:29:37 -07:00
Dan Finlay
a180fb0320
Merge pull request #3816 from MetaMask/kumavis-patch-2
identicon - set blockies height and width to identicon diameter
2018-03-31 09:31:03 -07:00
kumavis
9f7b63bb6a
identicon - set blockies height and width to identicon diameter 2018-03-30 21:45:49 -07:00
kumavis
d699c9b8b4
Merge pull request #3801 from danjm/i3684-txlistitemstest
Adds integration tests for different tx list items
2018-03-30 21:36:45 -07:00
kumavis
ee1acf0a7e
Merge pull request #3774 from danjm/i3686-txparamundefined-sigrequestsintxlist
Fix display of unapprovedMgs in txList; fix txParams undefined errors
2018-03-30 18:36:39 -07:00
kumavis
2e57c36f36
Merge pull request #3762 from danjm/i3471-checkbalanceonconfirmscreen
Checking for sufficient balance in tx confirmation screen
2018-03-30 18:36:08 -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
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
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
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