m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-24 02:58:09 +01:00
Code
1,111 Commits 2 Branches 0 Tags 265 MiB
6e1000f361
Commit Graph

1111 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Finlay
6e1000f361 Merge branch 'master' into PopupNotifications 2016-08-22 15:03:36 -07:00
Dan Finlay
3756384da6 Merge pull request #568 from MetaMask/Version2.9.0 
Version 2.9.0
 2016-08-22 11:28:02 -07:00
Dan Finlay
31e0a3491b Version 2.9.0 2016-08-22 11:24:34 -07:00
Dan Finlay
a11979968c Merge pull request #562 from MetaMask/ethBalance 
Fix issue where a given balance does not need to be parsed
 2016-08-22 11:08:35 -07:00
Frankie
7e3b0aca62 Add test 2016-08-19 17:30:19 -07:00
Frankie
edfb0eb968 Fix issue where if given a balance that does not need to be parsed will not be parsed 2016-08-19 17:18:11 -07:00
Dan Finlay
30af7e96cb Merge pull request #559 from MetaMask/shapeshiftTx 
Shapeshift tx
 2016-08-19 07:57:51 -07:00
Dan Finlay
9cd85aea2f Merge branch 'master' into shapeshiftTx 2016-08-19 07:50:57 -07:00
Dan Finlay
9c29328085 Merge pull request #557 from MetaMask/balance-fix 
Fix rounding issues.
 2016-08-19 07:50:37 -07:00
Frankie
e3e5538ddc Remove "+" from shapeshift tx and change wording in CHANGELOG 2016-08-18 20:24:17 -07:00
Frankie
5b9f7a9288 Delete npm-debug.log 2016-08-18 18:00:09 -07:00
Frankie
f80b9b2693 Create a dev state with shapeshift tx 2016-08-18 17:51:38 -07:00
Frankie
98dab0ffd2 Make ballance teal for shapeshift tx and add to change log 2016-08-18 16:30:13 -07:00
Kevin Serrano
d53b056425 Bump changelog. 2016-08-18 16:04:51 -07:00
Kevin Serrano
683651e75d Lint and changelog. 2016-08-18 16:01:40 -07:00
Kevin Serrano
4cebf12bb5 Fix rounding issues. 2016-08-18 15:59:37 -07:00
Frankie
3525dc0801 Create a ShapeShift tx in tx History 2016-08-18 15:20:26 -07:00
Frankie
23aeb1c5c1 Add api Public key 2016-08-18 12:20:24 -07:00
Frankie
efa61f2cf8 Merge branch 'master' into shapeshiftTx 2016-08-18 11:06:32 -07:00
Frankie
752d16f6c0 WIP: ShapeShift tx 2016-08-18 11:04:28 -07:00
Dan Finlay
270dbacbc4 Bump changelog 2016-08-16 17:52:38 -07:00
Dan Finlay
dfaac78e39 Linted 2016-08-16 17:50:51 -07:00
Dan Finlay
a167bbc5a0 MVP Popup Notifications Working 
I'm unsure which will be more performant: A notification using a trimmed down version of the UI, or using them both, letting the browser cache them both.

In any case, here I've modified the normal UI to recognize when it's a popup, and change the UX accordingly in a few ways:
 - Hide the menu bar
 - Hide the back button from the notifications view.
 - When confirming the last tx, close the window.
 2016-08-16 17:32:54 -07:00
Dan Finlay
030bdec27a Unify notification and popup ui files 2016-08-16 16:46:44 -07:00
Dan Finlay
4ba90969ee Merge branch 'master' into PopupNotifications 2016-08-16 15:41:11 -07:00
Dan Finlay
5479509618 Set up MVP for popup-based notifications. 2016-08-16 15:39:40 -07:00
Dan Finlay
90d6bec3ed Merge pull request #520 from MetaMask/usd-conversion 
Conversion implementation
 2016-08-16 15:32:06 -07:00
Kevin Serrano
666f3cd66c Added compliance for tests and properly accounts for N/A conversions. 2016-08-16 15:11:40 -07:00
Kevin Serrano
121af0c4b9 Lint. 2016-08-16 14:51:55 -07:00
Kevin Serrano
5afaebe602 Remove logs. 2016-08-16 14:49:53 -07:00
Kevin Serrano
0b052e94cc Hide conversions when API fails. 2016-08-16 14:49:21 -07:00
Kevin Serrano
9afa978121 Remove npm debug log. 2016-08-16 14:30:22 -07:00
Kevin Serrano
d43ac808ff Fix uncalled fn. 2016-08-16 14:28:32 -07:00
Kevin Serrano
7d40f29993 Add to changelog. 2016-08-16 14:13:18 -07:00
Kevin Serrano
3814bf8f5d Change account list balance rendering. 2016-08-16 14:13:03 -07:00
Kevin Serrano
6cee99f0ba Remove console logs. 2016-08-16 14:08:14 -07:00
Kevin Serrano
3b27fe1356 Add recent conversion date. 2016-08-16 14:07:42 -07:00
Kevin Serrano
6041ba1ed2 Add fallback to API failure. 2016-08-16 14:07:06 -07:00
Kevin Serrano
da2527ddb4 Remove react-select as dependency. 2016-08-16 13:23:28 -07:00
Kevin Serrano
58e3042a3b Remove logging. Clean up duplicate entries in currency list. 2016-08-16 13:21:16 -07:00
Kevin Serrano
6e51a5aa75 Add to package request-promise. 2016-08-16 11:26:02 -07:00
Kevin Serrano
7725f38147 Merge branch 'master' into usd-conversion 2016-08-16 10:50:39 -07:00
Kevin Serrano
daba8e87bb Remove extra test. 2016-08-16 10:50:03 -07:00
Kevin Serrano
7d1b2db87e linting and ignoring. 2016-08-16 10:48:31 -07:00
Kevin Serrano
009784c79b Divided eth components for tx and account detail. 2016-08-16 10:34:29 -07:00
Frankie
f1986d7a37 Merge pull request #550 from MetaMask/Version2.8.0 
Version 2.8.0
 2016-08-15 10:58:53 -07:00
Dan Finlay
e5f2c1a866 Version 2.8.0 2016-08-15 10:56:01 -07:00
Kevin Serrano
6895d330ff Merge master. 2016-08-15 10:50:53 -07:00
Dan Finlay
271e3c4fdf Merge pull request #547 from MetaMask/cssFixes 
Add margin to "go to test faucet" button and show more of the address…
 2016-08-14 22:41:23 -07:00
Frankie
2ef4cbaa89 Add margin to "go to test faucet" button and show more of the address on qr code page 2016-08-14 21:41:08 -07:00