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

6369 Commits

Author SHA1 Message Date
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
Alexander Tseung
6277a4c46a Refactor onboarding flow 2018-04-02 02:59:49 -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
bd6f554766 build - use uglifyify and gulp-multi-process for better performance 2018-03-30 22:19:02 -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
8db097d8d9 ci - screens - increase delay before setting provider type 2018-03-30 18:14:26 -07:00
kumavis
6d3da95a95 ci - breakout announce job to upload builds and screenshots 2018-03-30 17:59:15 -07:00
Alexander Tseung
2fa554a641 Fix conf-tx render 2018-03-30 17:37:24 -07:00
kumavis
69ff600c74 ci - screens - add delay after setting network 2018-03-30 17:36:43 -07:00
kumavis
6d6fc7df1c ci - build:announce - fix script path 2018-03-30 17:27:33 -07:00
kumavis
bc1a456264 ci - build:announce - replace bash qith js because of string escaping nightmare 2018-03-30 17:20:48 -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
kumavis
662b1957f4 ci - build:announce - fix json escaping 2018-03-30 16:25:22 -07:00
Alexander Tseung
ba23843f91 Fix merge conflicts 2018-03-30 16:18:48 -07:00
kumavis
f5cf39b940 ci - build:announce - fix json escaping 2018-03-30 16:12:13 -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
kumavis
f13733c790 ci - build:announce - fix shell script path 2018-03-30 16:03:54 -07:00
frankiebee
3def45004a transactions#newUnapprovedTransaction - dont default origin to metamask 2018-03-30 16:00:11 -07:00
kumavis
213496f190 ci - build:announce - break out into shell script 2018-03-30 15:53:45 -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
kumavis
86c768dfb0 ci - build:announce - rewrite github comment to include walkthrough gif 2018-03-30 15:36:22 -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
kumavis
a3f7cd1cfc development - ci-screens - remove mocha wrapper that was losing exit code 2018-03-30 15:03:49 -07:00
kumavis
7a406d51c3 development - screens - fix screenshot on failure 2018-03-30 14:48:41 -07:00
kumavis
d05a2ca968 development - screens - screenshot on failure 2018-03-30 14:39:43 -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
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