Kevin Serrano
69aa2ed25f
Merge branch 'master' into FixLogoPasswordFollow
2016-09-09 09:40:35 -07:00
Kevin Serrano
348f1fb797
Merge pull request #631 from MetaMask/i599-LoginLoadingIndication
...
Show loading indication during unlocking.
2016-09-09 09:35:41 -07:00
Dan Finlay
a4e4c85453
Fix fox logo password following
...
The new lightweight svg logo was not following text quite right.
The new `lookAt` method was not using the same logic the module was using internally on mouse movement.
I simply used that logic and exposed it via the old (expected) API, and got it behaving the way I like.
2016-09-08 20:31:42 -07:00
Dan Finlay
7b6c018c39
Show loading indication during unlocking.
2016-09-08 19:53:54 -07:00
Dan Finlay
2f98d5bc0f
Bump changelog
2016-09-08 19:50:55 -07:00
Dan Finlay
01f3683dcf
Only init one wallet on restore
...
Fixes #610
2016-09-08 19:49:28 -07:00
Frankie
c97aef2b99
Merge pull request #629 from MetaMask/FixLogoLeak
...
Fix new logo related errors
2016-09-08 16:03:25 -07:00
Dan Finlay
4a7eab5b1a
Merge branch 'master' into FixLogoLeak
2016-09-08 15:43:51 -07:00
Dan Finlay
6c05c221cd
Fix new logo related errors
...
Fixed logo deallocation related bugs, had to patch the logo repo itself to add a stopAnimating method.
Also tuned up the logo to more closely resemble the old behavior.
- Overlaps the title text
- Points nose at cursor, not just front of eyes
- Cursor is more "distant" from fox, to avoid extreme angles on edges.
2016-09-08 15:41:21 -07:00
Dan Finlay
fc0f64a5a8
Merge pull request #627 from MetaMask/i#589pendingTxsIssue
...
I#589pending txs issue
2016-09-08 15:39:42 -07:00
Frankie
3f64095eed
Merge branch 'i#589pendingTxsIssue' of https://github.com/MetaMask/metamask-plugin into i#589pendingTxsIssue
2016-09-08 14:56:19 -07:00
Frankie
ece1ecb90b
Fix wording in changelog and bug
2016-09-08 14:53:49 -07:00
Frankie
079c1a8972
Merge branch 'master' into i#589pendingTxsIssue
2016-09-08 13:45:27 -07:00
Frankie
0d4bfe8038
Remove console.log
2016-09-08 13:44:32 -07:00
Kevin Serrano
1f0b2ca787
Merge pull request #625 from MetaMask/AddNewLogo
...
Add new lightweight logo
2016-09-08 13:42:05 -07:00
Frankie
7d8491de10
Add to CHANGELOG.md and Remove unnecessary catch
2016-09-08 13:13:43 -07:00
Frankie
69580480bc
Merge branch 'master' into i#589pendingTxsIssue
2016-09-08 12:56:48 -07:00
Frankie
6f86c5f8ee
Add network checks for unconfirmed Txs
2016-09-08 12:56:04 -07:00
Dan Finlay
a1e9b951ac
Bump changelog
2016-09-08 12:51:14 -07:00
Dan Finlay
762bf2f48a
Merge branch 'master' into AddNewLogo
2016-09-08 12:49:57 -07:00
Dan Finlay
8d981ac87f
Remove npm i again because apparently that worked
2016-09-08 12:47:11 -07:00
Dan Finlay
fbf3dceca0
Remove deps added for older ubuntu
2016-09-08 12:19:14 -07:00
Dan Finlay
67b3309c3a
Remove npm i to check if cache held
2016-09-08 12:01:08 -07:00
Dan Finlay
6b9922ad1d
Try adding npm i to circle.yml
2016-09-08 11:49:44 -07:00
Kevin Serrano
80847739b2
Merge pull request #615 from MetaMask/ModularFiatBalance
...
Add fiat conversion to tx confirmation view
2016-09-08 11:48:06 -07:00
Dan Finlay
20ae4c2689
Fix logo usage for metamask-logo v2.0.0
...
- No longer need to check for webGL compliance (svg rendered!)
- logo.canvas has been replaced with logo.container, since svg doesn't render to canvas but to an element.
Otherwise, worked with very little effort!!
Fixes #624
2016-09-08 11:22:04 -07:00
Dan Finlay
452ce14fda
Update locked state
2016-09-08 11:20:45 -07:00
Dan Finlay
ab3b409438
Restore broken variable reference
2016-09-08 11:03:47 -07:00
Dan Finlay
c42b37a6e7
Merge branch 'ModularFiatBalance' of github.com:MetaMask/metamask-plugin into ModularFiatBalance
2016-09-08 10:57:31 -07:00
Dan Finlay
c3dbcb5b02
Fix double tooltip
2016-09-08 10:57:10 -07:00
Dan Finlay
d1e91766da
Merge branch 'master' into ModularFiatBalance
2016-09-08 10:50:05 -07:00
Frankie
5f8d3085d7
Filter out pending txs based on network from tx history
2016-09-07 20:56:51 -07:00
Dan Finlay
382e532d6d
Merge pull request #619 from johnweldon/master
...
Fix minor typo
2016-09-07 20:24:41 -07:00
John Weldon
d6619a25e9
Fix typo
2016-09-07 14:44:56 -07:00
Kevin Serrano
03c84cff69
Merge pull request #618 from MetaMask/RollbackLeakFix
...
Reverting memory leak fix
2016-09-06 20:11:16 -07:00
Dan Finlay
440e0797a7
Reverting memory leak fix
...
This wasn't a good enough fix, and had other repercussions.
Looking for a way to properly detect EOS, and tear down the correct stream accordingly.
2016-09-06 20:01:41 -07:00
Dan Finlay
2ca58f5bf7
Merge branch 'master' into ModularFiatBalance
2016-09-06 19:36:40 -07:00
Kevin Serrano
54425f4ee7
Merge pull request #617 from MetaMask/i616-FixListenerLeak
...
I616 fix listener leak
2016-09-06 19:07:30 -07:00
Dan Finlay
2564c0c51c
Bump changelog
2016-09-06 18:59:47 -07:00
Dan Finlay
bfea26d3e3
Ensure listener is cleaned up
...
Also fixed bug when validating a tx with no value.
2016-09-06 18:56:26 -07:00
Dan Finlay
e75a1d63f7
Bump changelog
2016-09-06 17:31:24 -07:00
Dan Finlay
0186e05a0d
Linted
2016-09-06 17:30:38 -07:00
Dan Finlay
1537e3f5da
Add fiat balances to tx conf view
2016-09-06 17:28:25 -07:00
Dan Finlay
16fe97676c
Add fiat conversion to pending tx development state
2016-09-06 17:27:26 -07:00
Dan Finlay
c46de79c10
Got basic fiat display modularized
2016-09-06 17:08:56 -07:00
Dan Finlay
90638f95c0
Fix fiat-value
2016-09-06 16:55:52 -07:00
Dan Finlay
09dd854a96
Nearly finished factoring fiat value into eth-balance
2016-09-06 16:45:06 -07:00
Dan Finlay
b1cd7ebc47
Merge pull request #612 from MetaMask/first-time
...
Open Introduction Video tab on install
2016-09-06 15:34:23 -07:00
Kevin Serrano
01618a88aa
Update changelog and merge master.
2016-09-06 15:30:30 -07:00
Kevin Serrano
1117874953
Merge branch 'master' into first-time
2016-09-06 15:29:40 -07:00
