m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 01:39:44 +01:00
Code
1,655 Commits 2 Branches 0 Tags 265 MiB
694f34ae9a
Commit Graph

1655 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kumavis
56bdccc76d Merge pull request #657 from MetaMask/library 
mascara - popup initially working
 2016-09-13 15:49:47 -07:00
kumavis
9e2d4d2bc9 Merge branch 'master' into library 2016-09-13 15:39:44 -07:00
kumavis
4b880b87bc mascara - run background in iframe 2016-09-13 15:27:58 -07:00
Kevin Serrano
d05dfc4eed Merge pull request #656 from MetaMask/i646-ClosePopupBug 
Fix popup closing bug
 2016-09-13 13:14:14 -07:00
Dan Finlay
b624155e60 Merge branch 'i646-ClosePopupBug' of github.com:MetaMask/metamask-plugin into i646-ClosePopupBug 2016-09-13 13:00:29 -07:00
Dan Finlay
3da0d61417 Bump changelog 2016-09-13 12:54:30 -07:00
Dan Finlay
194f1724f3 Merge branch 'master' into i646-ClosePopupBug 2016-09-13 12:53:28 -07:00
Dan Finlay
3b2182f576 Merge pull request #648 from MetaMask/qrCode 
Put qr button back in account detail screen...
 2016-09-13 12:52:43 -07:00
Dan Finlay
31e5165cae Merge branch 'master' into i646-ClosePopupBug 2016-09-13 12:51:51 -07:00
kumavis
11363b4f2a Merge pull request #655 from MetaMask/FixPortStreamEnd 
Fix port stream end bug
 2016-09-13 12:49:44 -07:00
Frankie
19c1b1fd8e Merge branch 'master' into qrCode 2016-09-13 12:18:19 -07:00
kumavis
54ecb09a20 Merge pull request #655 from MetaMask/FixPortStreamEnd 
Fix port stream end bug
 2016-09-13 12:14:32 -07:00
Dan Finlay
e10c651db0 Fix port stream end bug 
Emitting `end` or `close` was not ending the stream.

Pushing a null packet also closes a stream, so I did that instead.

Fixes #616
 2016-09-13 12:07:29 -07:00
kumavis
b13eaaa0cd Merge pull request #651 from MetaMask/library 
MetaMask "Mascara" Library - initial PR
 2016-09-13 11:29:46 -07:00
kumavis
81d25d560f mascara - serve popup bundle 2016-09-13 10:19:40 -07:00
kumavis
f7794d9949 PendingTxDetails - partially remove imagify support 2016-09-13 10:18:57 -07:00
kumavis
c477411ce0 Merge branch 'library' of github.com:MetaMask/metamask-plugin into library 2016-09-13 00:37:41 -07:00
kumavis
93c703d0ef mascara - add readme 2016-09-13 00:37:22 -07:00
kumavis
2aa8b91a65 Merge branch 'master' into library 2016-09-13 00:33:15 -07:00
kumavis
a4cdd19843 mascara - everything but the popup bundle 2016-09-13 00:31:04 -07:00
kumavis
b4e3b83f04 popup - breakout popup-core 2016-09-12 23:28:07 -07:00
Dan Finlay
b4344f2a02 Merge pull request #650 from MetaMask/FixCacheBustBug 
Fix cache clearing reference for Opera
 2016-09-12 22:19:14 -07:00
Dan Finlay
b508541935 Fix cache clearing reference for Opera 
For some reason Chrome didn't mind this awful bug, but Opera caught it.
 2016-09-12 22:13:52 -07:00
kumavis
ed11ab6d18 popup - further clean and comment 2016-09-12 21:43:14 -07:00
kumavis
8a5007a396 ui - remove unused currentDomain prop 2016-09-12 21:30:04 -07:00
kumavis
5126ddaf0c mascara - server - prepare to serve popup 2016-09-12 19:48:39 -07:00
kumavis
4cfcb4452a bugfix - prevent iframe restart restart 2016-09-12 18:30:45 -07:00
Frankie
4aa5114019 Remove unused code in qr actions 2016-09-12 17:32:49 -07:00
Frankie
fc292627e4 Merge branch 'master' into qrCode 2016-09-12 17:30:54 -07:00
Frankie
09bd35ac7a Add to CHANGELOG.md 2016-09-12 17:29:54 -07:00
Frankie
218f380d87 Add qrcode-npm to package.json and swap out Qr Code generator api for node-module 2016-09-12 17:27:14 -07:00
Dan Finlay
f70bb30d2c Merge pull request #647 from MetaMask/Version-2.11.0 
Version 2.11.0
 2016-09-12 15:51:44 -07:00
Dan Finlay
ebf86f930a Version 2.11.0 2016-09-12 15:45:32 -07:00
Kevin Serrano
e210d0d519 Merge pull request #645 from MetaMask/FixPasswording 
Fix account unlocking
 2016-09-12 15:29:56 -07:00
Dan Finlay
0ea0a9813d Make cache clearning error tolerant 2016-09-12 15:26:07 -07:00
kumavis
850b6d1440 Merge branch 'master' of github.com:MetaMask/metamask-plugin into library 2016-09-12 15:25:36 -07:00
Dan Finlay
c3d1404e72 Fix clearing of account cache on vault restore 2016-09-12 15:18:32 -07:00
Dan Finlay
784856532c Ensure loading indication covers fox 2016-09-12 14:37:17 -07:00
Dan Finlay
02b57adbf1 Linted 2016-09-12 14:34:45 -07:00
Dan Finlay
1ba83766bb Load accounts into ethStore on unlock 2016-09-12 14:33:54 -07:00
Dan Finlay
2caac3c7d7 Fix single account list formatting 2016-09-12 14:27:26 -07:00
Dan Finlay
0d11eab8cb Add accounts back to metamask state 2016-09-12 14:22:06 -07:00
Dan Finlay
6fcbb43c50 Merge branch 'master' into FixPasswording 2016-09-12 11:35:50 -07:00
Dan Finlay
4a47f26e8c Fix keystore reference 2016-09-12 11:25:30 -07:00
Dan Finlay
e0e38b879f Fix some references 2016-09-12 11:21:27 -07:00
Dan Finlay
363c2a0939 Fix account unlocking 
SubmitPassword was not creating a new id-management

This is because I broke up the old "createIdmgmt" method to not perform as much conditional logic.

Now the pieces are reusable and do what they should do.
 2016-09-12 11:13:26 -07:00
Frankie
b8f75e387a Merge pull request #644 from MetaMask/revert-638-i555-SaltVault 
Revert "Add new eth-lightwallet salting to vault."
 2016-09-12 10:40:59 -07:00
Frankie
c37c050c8a Revert "Add new eth-lightwallet salting to vault." 2016-09-12 10:34:06 -07:00
Frankie
fcc9ca812e Merge pull request #638 from MetaMask/i555-SaltVault 
Add new eth-lightwallet salting to vault.
 2016-09-12 10:22:06 -07:00
Dan Finlay
56b9b1766d Merge branch 'master' into i555-SaltVault 2016-09-12 09:47:03 -07:00