m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-21 08:53:20 +01:00
Code
6,273 Commits 2 Branches 0 Tags 265 MiB
6ecf2c8092
Commit Graph

6273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
kumavis
a1c3c944cf dapp reload - fixed disconnect detection via polling 2016-10-12 12:35:55 -07:00
Dan Finlay
535d832a64 Merge branch 'master' into i328-MultiVault 2016-10-12 10:58:58 -07:00
Frankie
229d95956b Merge branch 'master' into i#495CustomGasField 2016-10-11 16:19:13 -07:00
Frankie
d67a5031c7 Merge pull request #723 from MetaMask/i721-ScrollAccountList 
I721 scroll account list
 2016-10-11 16:18:37 -07:00
Dan Finlay
5d01d50c16 Merge branch 'master' into i721-ScrollAccountList 2016-10-11 16:13:53 -07:00
Dan Finlay
bbaf79f576 Merge pull request #702 from MetaMask/tos 
Terms of Service UI Update
 2016-10-11 16:13:21 -07:00
Kevin Serrano
39f2118d31
Remove logs. 2016-10-11 16:03:52 -07:00
Dan Finlay
e1ece0f0e3 Bump changelog 2016-10-11 16:00:31 -07:00
Dan Finlay
1dc2612f8e Remove flex class from account list container 2016-10-11 15:59:55 -07:00
Dan Finlay
06910025ff Add more accounts to account list ui state 2016-10-11 15:59:39 -07:00
Kevin Serrano
5c0c370fe4
Remove comments. 2016-10-11 15:52:44 -07:00
Kevin Serrano
9d267907ee
Merge branch 'tos' of github.com:MetaMask/metamask-plugin into tos 2016-10-11 15:51:26 -07:00
Kevin Serrano
5e9bc31c58
Cleanup. 2016-10-11 15:50:02 -07:00
Dan Finlay
5c9476e57d Fix bug where new vaults had no nicknames 2016-10-11 15:29:12 -07:00
Dan Finlay
ea1a934c7d Add initial KeyringController files 2016-10-11 15:12:23 -07:00
Dan Finlay
f8b52a3895 Add to doc 2016-10-11 15:06:09 -07:00
Kevin Serrano
f7361d9654
lint 2016-10-11 14:49:24 -07:00
Kevin Serrano
79a99ac93b
Move tos hash comparison logic from background to mm controller. 2016-10-11 14:33:30 -07:00
Kevin Serrano
26bd4b25ef
Remove version from terms of service. 2016-10-11 14:33:05 -07:00
Kevin Serrano
ed03b89e26
Move tos hash logic to build phase. Create dynamic global variables based on build. 2016-10-11 14:32:03 -07:00