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

1592 Commits

Author SHA1 Message Date
Dan Finlay f14fdf7a25 Change actions reference to keyringController to background 2016-10-20 09:58:33 -07:00
Dan Finlay 40f175c06f Linted 2016-10-20 09:50:29 -07:00
Dan Finlay 331bb735c7 Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault 2016-10-20 09:49:49 -07:00
Kevin Serrano 12698b9462
Resolve merge conflict. 2016-10-19 17:49:13 -07:00
Dan Finlay 94f2554369 Add debug flag to dev mode 2016-10-19 15:15:27 -07:00
Kevin Serrano afbc4c832b
Git merge resolution. 2016-10-19 14:57:30 -07:00
Kevin Serrano ad3fa24a28
Intermediary commit. 2016-10-19 14:55:08 -07:00
Kevin Serrano 725d503f68
Remove unused crypto dependencies. 2016-10-19 14:06:48 -07:00
Kevin Serrano 153bb25947
Add crypto packages to package.json 2016-10-19 13:56:21 -07:00
Kevin Serrano 17506fe14f
Merge in crypto. 2016-10-19 11:17:29 -07:00
Kevin Serrano a88a48ba14 Merge pull request #749 from MetaMask/Version-2.13.5 
Version 2.13.5
 2016-10-18 14:20:09 -07:00
Dan Finlay f31fef034f Fix changelog date 2016-10-18 14:07:47 -07:00
Dan Finlay 182fd30db5 Fix cli flag capitalization 2016-10-18 14:02:06 -07:00
Dan Finlay 70f3d24e90 Version 2.13.5 2016-10-18 14:00:33 -07:00
Dan Finlay 60097d8fba Remove livereload from prod builds 2016-10-18 14:00:20 -07:00
kumavis a542118a55 Merge pull request #748 from MetaMask/i746-ReloadBug 
Wait for first metamask data to establish ping-pong stream.
 2016-10-18 13:58:14 -07:00
Dan Finlay cc23158bfe Wait for first metamask data to establish ping-pong stream. 
Prevents infinite reload loops when dapps take too long to load.

Fixes #746.
 2016-10-18 13:51:50 -07:00
kumavis 0f0951ba54 Merge pull request #744 from MetaMask/i738-IncreaseGas 
Increase gas estimate by 100000 wei
 2016-10-17 13:33:02 -07:00
Dan Finlay 827d7553fc Restore hex prefix to gas price 2016-10-17 13:05:45 -07:00
Dan Finlay 91f43fa213 Increase gas estimate by 100000 wei 
To prevent minor gas estimation errors, probably usually related to operating on dynamic state.

Fixes #738.
 2016-10-17 12:47:37 -07:00
Kevin Serrano 101e839f9a Merge pull request #737 from MetaMask/Version-2.13.4 
Version 2.13.4
 2016-10-17 10:52:04 -07:00
Dan Finlay 5864044538 Version 2.13.4 2016-10-17 10:37:23 -07:00
Dan Finlay 6d4c685636 Merge pull request #736 from MetaMask/i735-xmlfix 
Prevent injections on XML
 2016-10-17 10:31:15 -07:00
Kevin Serrano bc6092e111
Merge branch 'master' into i735-xmlfix 2016-10-17 10:25:00 -07:00
kumavis 11c114599c Merge pull request #720 from MetaMask/i#495CustomGasField 
add a gasPrice field
 2016-10-16 12:54:23 -07:00
Kevin Serrano 0d495372da
Lint. 2016-10-15 15:41:24 -07:00
Kevin Serrano 91a8977d27
Bump changelog. 2016-10-15 15:33:55 -07:00
Kevin Serrano 8a5eacd35f
Prevent XML from web3 injections. 2016-10-15 15:33:49 -07:00
Kevin Serrano 1481a3ef8e
Initial work on UI side 2016-10-15 10:48:12 -07:00
Dan Finlay 036b0e4cca Linted 2016-10-14 16:29:24 -07:00
Dan Finlay 69aed23e9b Fixed vector usage in encryptor 2016-10-14 16:26:44 -07:00
Dan Finlay 1c791c4d2e Got basic encryptor working 2016-10-14 15:59:07 -07:00
Dan Finlay c9cfcd5253 Got encrypting working, not yet decrypting 2016-10-14 13:21:00 -07:00
Frankie 35232c5e29 Fix for linting 2016-10-13 18:08:15 -07:00
Frankie aace26c4bd Create callback and Clean-up details 2016-10-13 16:53:32 -07:00
Frankie 328f8b0cac fix spelling 2016-10-13 16:22:45 -07:00
Frankie 67eba9f542 Specify base 10 in bignumber 2016-10-13 16:04:23 -07:00
Frankie b200f74d5f Merge branch 'master' into i#495CustomGasField 2016-10-13 15:17:30 -07:00
Frankie c400f7c0f6 Fix gasPrice range 2016-10-13 15:10:29 -07:00
Dan Finlay cce8d9e360 Began adding browser-native encryptor module 
Added new Qunit build process that will browserify the contents of `test/integration/lib` into the QUnit browser, allowing much more modular testing, including unit testing of our modules in our target browsers.

Made a basic unit test file of this form for the new encryptor module, which fails miserably because I've only just begun to work with it.

I've started with this blog post as a starting point, and will be adjusting it to our needs from there:
http://qnimate.com/passphrase-based-encryption-using-web-cryptography-api/
 2016-10-12 20:07:46 -07:00
Kevin Serrano 7cba71fc55
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into origin/i328-MultiVault 2016-10-12 17:12:52 -07:00
Dan Finlay cd2c00a318 Add minimal method signatures to new keyring controller 2016-10-12 17:05:39 -07:00
Dan Finlay 93ed918caa Remove additional deprecated action 2016-10-12 16:43:35 -07:00
Dan Finlay 5c9969e126 Remove opinionated seed word code 
Completely breaking all account maangement, I have removed the opinionated seed-word code from the UI.

Web3 injection still seems to work.
 2016-10-12 16:31:15 -07:00
kumavis 8d5b2478e3 Merge pull request #730 from MetaMask/i695-dapp-reload 
dapp reload - fixed disconnect detection via polling
 2016-10-12 13:52:32 -07:00
kumavis 465cff78c3 Merge branch 'master' into i695-dapp-reload 2016-10-12 13:49:18 -07:00
Kevin Serrano f68673e84a Merge pull request #733 from MetaMask/tos-fix 
Fix misnamed variable.
 2016-10-12 13:08:37 -07:00
Kevin Serrano d750daed5c
Remove logs. 2016-10-12 13:05:15 -07:00
Kevin Serrano 3954ed2a7e
Fix misnamed variable. 2016-10-12 13:04:21 -07:00
kumavis 88a68f732e Merge branch 'master' into i695-dapp-reload 2016-10-12 13:03:15 -07:00