m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-24 02:58:09 +01:00
Code
1,618 Commits 2 Branches 0 Tags 265 MiB
7b3f1ecc41
Commit Graph

1618 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kumavis
d3bd6236a8 Merge pull request #666 from MetaMask/i#626 
Dont generate a popup notification for transactions from within metmask-extension
 2016-09-14 15:14:42 -07:00
Dan Finlay
a0bfdfe409 Do not show user rejection errors within our UI. 2016-09-14 14:34:54 -07:00
Frankie
034742a571 Merge branch 'master' into i#626 2016-09-14 12:42:35 -07:00
Frankie
8e7a9c4709 Remove unused argument 2016-09-14 12:22:39 -07:00
Dan Finlay
b7e6ec5cea Fix popup flag assignment 2016-09-14 11:57:41 -07:00
Dan Finlay
b2103cbec7 Merge pull request #665 from MetaMask/Version-2.12.0 
Version 2.12.0
 2016-09-14 11:42:09 -07:00
Frankie
cf26523852 Merge branch 'master' into i#626 2016-09-14 11:40:11 -07:00
Dan Finlay
19a354066b Version 2.12.0 2016-09-14 11:38:59 -07:00
Frankie
17481ff61a Add to CHANGELOG.md 2016-09-14 11:36:56 -07:00
Dan Finlay
03094091d1 Version 2.11.2 2016-09-14 11:35:50 -07:00
Frankie
eea77b828f Dont generate a popup notification when submiting a transaction from with in MetaMask 2016-09-14 11:31:59 -07:00
Dan Finlay
440cdf8774 Merge pull request #663 from MetaMask/pe805 
deps - bump provider-engine 8.0.5
 2016-09-14 11:28:42 -07:00
kumavis
f628b0d1f9 deps - bump provider-engine 8.0.5 2016-09-14 11:17:15 -07:00
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