49ab51d825
Merge branch 'master' into PopupNotifications
2016-08-22 20:06:59 -07:00
9dad3a5917
Merge pull request #573 from MetaMask/kumavis-patch-1
...
inpage - cleanContextForImports fix
2016-08-22 19:33:26 -07:00
c97866e367
Merge branch 'master' into kumavis-patch-1
2016-08-22 19:23:01 -07:00
07927b5798
Merge pull request #558 from MetaMask/i390-TransactionLimit
...
Enforce transaction log limit
2016-08-22 19:22:31 -07:00
8b9999b71e
inpage - cleanContextForImports fix
...
set to undefined instead of deleting
updates #447
2016-08-22 19:22:12 -07:00
5c9ca21ba3
Merge branch 'master' into i390-TransactionLimit
2016-08-22 19:19:53 -07:00
f9c58c0746
Merge pull request #572 from MetaMask/i479
...
inpage provider - reassign incomming ids
2016-08-22 19:17:18 -07:00
2f01ec5be2
Merge branch 'master' into i479
2016-08-22 19:14:58 -07:00
b8077983d6
inpage provider - reassign incomming ids
2016-08-22 18:59:15 -07:00
a0d0245343
Add gulp tasks as npm scripts
2016-08-22 17:37:23 -07:00
5d24621b56
More linting
2016-08-22 17:37:16 -07:00
a9b53530b6
Fix back button hiding on popup
2016-08-22 17:29:47 -07:00
17f3f90d80
Linted
2016-08-22 17:21:54 -07:00
75fd650f69
Merge branch 'master' into PopupNotifications
2016-08-22 17:18:53 -07:00
361e26fad7
Limit to one popup, re-focus on additional notifications.
2016-08-22 17:18:14 -07:00
b79a52c71c
Merge pull request #571 from MetaMask/chinese-local
...
Chinese and Spanish localization
2016-08-22 16:43:49 -07:00
642e84da6c
Merge master
2016-08-22 15:04:13 -07:00
6e1000f361
Merge branch 'master' into PopupNotifications
2016-08-22 15:03:36 -07:00
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
bc2abd0a78
First part of chinese translation.
2016-08-22 14:11:32 -07:00
18aef9570f
Add spanish locales.
2016-08-22 14:07:02 -07:00
c223ba2e00
Add builds.zip to gitignore
2016-08-22 11:59:26 -07:00
3d451ddf3e
Merge branch 'master' into i390-TransactionLimit
2016-08-22 11:59:08 -07:00
3756384da6
Merge pull request #568 from MetaMask/Version2.9.0
...
Version 2.9.0
2016-08-22 11:28:02 -07:00
31e0a3491b
Version 2.9.0
2016-08-22 11:24:34 -07:00
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
7e3b0aca62
Add test
2016-08-19 17:30:19 -07:00
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
30af7e96cb
Merge pull request #559 from MetaMask/shapeshiftTx
...
Shapeshift tx
2016-08-19 07:57:51 -07:00
8592ffd855
Merge branch 'master' into i390-TransactionLimit
2016-08-19 07:57:35 -07:00
9cd85aea2f
Merge branch 'master' into shapeshiftTx
2016-08-19 07:50:57 -07:00
9c29328085
Merge pull request #557 from MetaMask/balance-fix
...
Fix rounding issues.
2016-08-19 07:50:37 -07:00
e3e5538ddc
Remove "+" from shapeshift tx and change wording in CHANGELOG
2016-08-18 20:24:17 -07:00
5b9f7a9288
Delete npm-debug.log
2016-08-18 18:00:09 -07:00
f80b9b2693
Create a dev state with shapeshift tx
2016-08-18 17:51:38 -07:00
fe5fff3248
Change 'View More' to 'Show More'
2016-08-18 17:47:42 -07:00
98dab0ffd2
Make ballance teal for shapeshift tx and add to change log
2016-08-18 16:30:13 -07:00
4f857e297b
Linted
2016-08-18 16:27:25 -07:00
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
d53b056425
Bump changelog.
2016-08-18 16:04:51 -07:00
683651e75d
Lint and changelog.
2016-08-18 16:01:40 -07:00
4cebf12bb5
Fix rounding issues.
2016-08-18 15:59:37 -07:00
7389f9d0a0
Enforce tx history limit
2016-08-18 15:40:56 -07:00
3525dc0801
Create a ShapeShift tx in tx History
2016-08-18 15:20:26 -07:00
23aeb1c5c1
Add api Public key
2016-08-18 12:20:24 -07:00
efa61f2cf8
Merge branch 'master' into shapeshiftTx
2016-08-18 11:06:32 -07:00
752d16f6c0
WIP: ShapeShift tx
2016-08-18 11:04:28 -07:00
270dbacbc4
Bump changelog
2016-08-16 17:52:38 -07:00
dfaac78e39
Linted
2016-08-16 17:50:51 -07:00
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
kumavis
kumavis
Dan Finlay
Kevin Serrano
Frankie
Frankie