m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 01:39:44 +01:00
Code
1,339 Commits 2 Branches 0 Tags 265 MiB
59fd86383f
Commit Graph

1339 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kumavis
8b9999b71e inpage - cleanContextForImports fix 
set to undefined instead of deleting
updates #447
 2016-08-22 19:22:12 -07:00
kumavis
5c9ca21ba3 Merge branch 'master' into i390-TransactionLimit 2016-08-22 19:19:53 -07:00
kumavis
f9c58c0746 Merge pull request #572 from MetaMask/i479 
inpage provider - reassign incomming ids
 2016-08-22 19:17:18 -07:00
kumavis
2f01ec5be2 Merge branch 'master' into i479 2016-08-22 19:14:58 -07:00
kumavis
b8077983d6 inpage provider - reassign incomming ids 2016-08-22 18:59:15 -07:00
Dan Finlay
a0d0245343 Add gulp tasks as npm scripts 2016-08-22 17:37:23 -07:00
Dan Finlay
5d24621b56 More linting 2016-08-22 17:37:16 -07:00
Dan Finlay
a9b53530b6 Fix back button hiding on popup 2016-08-22 17:29:47 -07:00
Dan Finlay
17f3f90d80 Linted 2016-08-22 17:21:54 -07:00
Dan Finlay
75fd650f69 Merge branch 'master' into PopupNotifications 2016-08-22 17:18:53 -07:00
Dan Finlay
361e26fad7 Limit to one popup, re-focus on additional notifications. 2016-08-22 17:18:14 -07:00
Dan Finlay
b79a52c71c Merge pull request #571 from MetaMask/chinese-local 
Chinese and Spanish localization
 2016-08-22 16:43:49 -07:00
Dan Finlay
642e84da6c Merge master 2016-08-22 15:04:13 -07:00
Dan Finlay
6e1000f361 Merge branch 'master' into PopupNotifications 2016-08-22 15:03:36 -07:00
Dan Finlay
f57cbe59fc Removed view more button, added account info button. 
Also:
- Also fixed bug that caused React warning when rendering the tx history.
- Renamed 'Transactions' to 'History', since it now has more than that.
 2016-08-22 14:36:21 -07:00
Kevin Serrano
bc2abd0a78 First part of chinese translation. 2016-08-22 14:11:32 -07:00
Kevin Serrano
18aef9570f Add spanish locales. 2016-08-22 14:07:02 -07:00
Dan Finlay
c223ba2e00 Add builds.zip to gitignore 2016-08-22 11:59:26 -07:00
Dan Finlay
3d451ddf3e Merge branch 'master' into i390-TransactionLimit 2016-08-22 11:59:08 -07:00
Kevin Serrano
cec88cc9ac Merge branch 'master' into fox-sub 2016-08-22 11:58:59 -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
Kevin Serrano
7a466697d3 Modify logic for component update. 2016-08-19 16:59:04 -07:00
Kevin Serrano
43e28788d7 Create replacement logo for non-webgl 2016-08-19 14:47:49 -07:00
Dan Finlay
30af7e96cb Merge pull request #559 from MetaMask/shapeshiftTx 
Shapeshift tx
 2016-08-19 07:57:51 -07:00
Dan Finlay
8592ffd855 Merge branch 'master' into i390-TransactionLimit 2016-08-19 07:57:35 -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
Dan Finlay
fe5fff3248 Change 'View More' to 'Show More' 2016-08-18 17:47:42 -07:00
Frankie
98dab0ffd2 Make ballance teal for shapeshift tx and add to change log 2016-08-18 16:30:13 -07:00
Dan Finlay
4f857e297b Linted 2016-08-18 16:27:25 -07:00
Dan Finlay
bd9d89826c Added view more button to transaction list 
Visible at the end of the transaction list, or if no transactions are listed, displayed right after the `No Transactions` message.
 2016-08-18 16:23:12 -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
Dan Finlay
7389f9d0a0 Enforce tx history limit 2016-08-18 15:40:56 -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