poanetwork
/
nifty-wallet
mirror of https://github.com/poanetwork/nifty-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,518 Commits 329 Branches 164 Tags 80 MiB
Commit Graph

1518 Commits

Author SHA1 Message Date
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
Dan Finlay 58a8f02294 Merge branch 'master' into ModularFiatBalance 2016-09-06 15:29:36 -07:00
Kevin Serrano 095a40e33d Merge pull request #614 from MetaMask/i546-NegativeErr 
Add negative value validation to tx approval
 2016-09-06 15:29:18 -07:00
Dan Finlay dcc24804a1 Add negative value validation to tx approval 2016-09-06 15:23:48 -07:00
Kevin Serrano f4e131da0a Fix capitalization. 2016-09-06 11:04:54 -07:00
Kevin Serrano 50f0624ea8 Replace chrome with generalized browser API. 2016-09-06 10:27:11 -07:00
Kevin Serrano 41632114c0 Add to changelog. 2016-09-06 10:25:14 -07:00
Kevin Serrano 9cb600e17a Redirect to video in a new tab on fresh install. 2016-09-06 10:24:31 -07:00
Kevin Serrano f213ca695c Fix typos and refine wording. 2016-09-06 10:03:10 -07:00
Kevin Serrano f6be97d9cf Merge pull request #611 from vincentserpoul/patch-1 
Error message more helpful
 2016-09-05 23:14:55 -07:00
Vincent Serpoul 4cf12337f2 linting 2016-09-06 11:24:09 +08:00
Vincent Serpoul 76d63ec4e0 Error message more helpful 2016-09-06 11:20:22 +08:00
kumavis 9857702e69 Merge pull request #609 from MetaMask/livereload 
Add ability to disable livereload
 2016-09-03 14:25:12 -07:00
Dan Finlay b2ebb6032d Continuing fiat balance modularization 2016-09-03 14:20:27 -07:00
Kevin Serrano be0c605556 Fix boolean. 2016-09-02 14:42:20 -07:00
Kevin Serrano 831ed15777 Merge branch 'master' into livereload 2016-09-02 14:16:13 -07:00