m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-10-23 11:46:13 +02:00
Code
6,372 Commits 2 Branches 0 Tags 265 MiB
2c4426e4de
Commit Graph

306 Commits

Author SHA1 Message Date
Alexander Tseung
1e6f062bb6 Fix integration tests 2018-04-06 11:25:05 -07:00
Alexander Tseung
007f91cc50 commit 2018-04-03 17:43:42 -07:00
Alexander Tseung
35875863d2 Fix merge conflicts. Modify send workflow 2018-04-03 01:03:31 -07:00
Alexander Tseung
516c1869b0 Fix lint errors 2018-04-02 16:24:37 -07:00
Alexander Tseung
6277a4c46a Refactor onboarding flow 2018-04-02 02:59:49 -07:00
Alexander Tseung
2fa554a641 Fix conf-tx render 2018-03-30 17:37:24 -07:00
Alexander Tseung
ba23843f91 Fix merge conflicts 2018-03-30 16:18:48 -07:00
Alexander Tseung
bdc4a6964a Fix merge conflicts. Refactor renderPrimary into Home component 2018-03-30 15:07:00 -07:00
kumavis
b49ad750dd Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artifacts 2018-03-29 16:54:00 -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
kumavis
10609493c5 ui - use relative location for images 2018-03-28 22:30:35 -07:00
Alexander Tseung
58f52b2b8d Fix merge conflicts. Refactor onboarding flow. 2018-03-28 13:23:50 -07:00
Dan
d2bd5687e8 Merge branch 'master' into i18n-translator-redux 2018-03-27 10:17:48 -02:30
Alexander Tseung
6f367a5a6b Fix merge conflicts 2018-03-27 00:20:35 -07:00
Dan
6393c38117 Pop uses new ui onboarding when in beta. 2018-03-22 14:29:18 -02:30
Dan
d24a0590d3 i18n redux solution doesn't require importing t() and passing state to each t() call; t is just available on props. 2018-03-21 22:11:47 -02:30
kumavis
29cc2f8ab9 Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux 2018-03-20 13:01:08 -07:00
Dan Finlay
e504bc6215 Add connecting indication templates 2018-03-19 11:28:02 -07:00
Dan
5733820024 Merge branch 'master' into i18n-translator-redux 2018-03-19 14:39:04 -02:30
Alexander Tseung
7fb27cf0c7
Update margins for consistency in first time flow (#3588) 2018-03-16 08:50:21 -07:00
Dan
5fe0be722b Handle i18n with redux. 2018-03-15 21:59:45 -02:30
kumavis
34aeef50a0 i18n - load locales manually 2018-03-14 16:32:35 -07:00
Thomas Huang
1d2cb46eff
Merge branch 'master' into i18n 2018-03-13 11:00:52 -07:00
Dan
0dad6db973 Styling fixes to welcome; hide network component on create password; shown welcoem in popup. 2018-03-12 14:33:45 -02:30
Dan
91c890041c Add welcome screen to new-ui browser first time flow. 2018-03-08 14:21:54 -03:30
Dan
9d215bab0f Merge branch 'master' into i18n 2018-03-06 20:45:45 -03:30
Dan Finlay
f06bca1151 Implemented feedback to make i18n work on mac 2018-03-06 15:32:35 -08:00
Alexander Tseung
5f8a632fec
Fix seed phrase validation clearing form (#3417) 
* Fix seed phrase validation clearing form

* Make new ui import seed error feedback live, and allow newlines with and without carriage returns.
 2018-03-06 09:14:57 -08:00
Dan J Miller
1bd18cebd7
Fixes shapeshift coin selection dropdown. (#3416) 2018-03-05 13:33:46 -03:30
Dan J Miller
0d97ff2210
Fix NewUI reveal seed flow. (#3410) 2018-03-02 22:44:05 -03:30
Dan
0739d3507b Adds beta label to Metamask name in full screen app bar. 2018-02-27 14:13:05 -03:30
Dan
def369ba07 Move beta warning to app header. 2018-02-27 14:13:05 -03:30
Dan
c26e0d555b Fix Import Existing DEN in popup New UI first time flow. 2018-02-19 22:46:18 -03:30
Dan J Miller
81eb5c8796
Ensures that mascara initialize screen is not shown in popup. (#3279) 2018-02-16 19:21:16 -03:30
Dan J Miller
170c7602b7
[NewUI] Adds the mascara first time flow to betaUI extension (#3257) 
* Adds the mascara first time flow to the extension when opened in browser.

* Fix tests after addition of mascara first time flow to new ui.
 2018-02-16 06:15:09 -03:30
Dan J Miller
fe2ed68f11 Remove chrome focus outline for mouse users. (#3230) 2018-02-12 09:45:53 -08:00
Alexander Tseung
72ffa2c3f5 Fix react-router related exceptions 2018-02-09 12:05:27 -08:00
Alexander Tseung
eb919f4710 Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254 2018-02-08 16:43:31 -08:00
Dan J Miller
7f151b861c
[NewUI] Opens to full screen when restoring from seed. (#3201) 
* Opens to full screen when restoring from seed.

* Remove redundant parameter in actions.markPasswordForgotten call.
 2018-02-07 21:08:55 -03:30
Alexander Tseung
0c6fef3dec Add create new account routes, fix conflicts from uat updates 2018-01-31 18:08:49 -08:00
Alexander Tseung
ecc39c5a7a Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 2018-01-29 18:22:52 -08:00
Alexander Tseung
81f86cfab6 Merge branch 'uat' into uat-master-011618 2018-01-16 18:17:28 -08:00
Dan Finlay
58be1742e1 Rename lock to log out 
Fixes #2475
 2018-01-15 16:04:49 -08:00
Dan
980e1bfcf8 New add account page with create and import options. 2018-01-12 13:42:51 -08:00
Chi Kei Chan
71a308d98b
Merge branch 'uat' into cb-388 2018-01-12 13:41:03 -08:00
Alexander Tseung
bdcee058dc Fix styling in initialization 2018-01-12 13:39:26 -08:00
Alexander Tseung
208e94d3bf Update main view styling 2018-01-10 21:09:09 -08:00
Alexander Tseung
a6f062a686 Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c 2018-01-03 11:06:08 -08:00
oosthuizenr
1da385f78b
fix comment 2018-01-02 21:29:26 +02:00