m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code
1,340 Commits 2 Branches 0 Tags 265 MiB
1b77d5300b
Commit Graph

1340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Serrano
2faf3f7063 Merge pull request #584 from MetaMask/shortcut-fix 
Fixed prohibited shortcut combination.
 2016-08-24 18:56:42 -07:00
Kevin Serrano
a9b390c58c Bump versioning. 2016-08-24 18:38:15 -07:00
Kevin Serrano
648dd59890 Merge branch 'master' into shortcut-fix 2016-08-24 18:37:01 -07:00
Kevin Serrano
8dfa701197 Fixed prohibited shortcut combination. 2016-08-24 18:33:27 -07:00
Dan Finlay
793ad6b8d8 Merge branch 'master' into PopupNotifications 2016-08-24 16:59:22 -07:00
Dan Finlay
4448b635b9 Merge pull request #583 from MetaMask/Version-2.9.1 
Version 2.9.1
 2016-08-24 16:39:16 -07:00
Dan Finlay
340d12f0cf Version 2.9.1 2016-08-24 16:32:15 -07:00
Kevin Serrano
07e5f94da8 Merge pull request #581 from MetaMask/i484PersistPendingSignatures 
Fix bug where unconfirmed message sig is lost when locked.
 2016-08-24 16:20:59 -07:00
Dan Finlay
eee08457e5 Merge branch 'master' into i484PersistPendingSignatures 2016-08-24 16:15:43 -07:00
Dan Finlay
c8c77aa8bd Merge pull request #579 from MetaMask/api-test-fix 
Api test fix
 2016-08-24 16:15:08 -07:00
Kevin Serrano
06b5e7f527 Merge branch 'master' into api-test-fix 2016-08-24 16:09:51 -07:00
Kevin Serrano
88671466c6 Merge pull request #580 from MetaMask/FixEmptySignBug 
Fix empty sign bug
 2016-08-24 16:07:38 -07:00
Dan Finlay
15c8680e21 Bump changelog 2016-08-24 16:02:47 -07:00
Dan Finlay
3febbdae57 Linted 2016-08-24 16:02:22 -07:00
Dan Finlay
abb5b2013d Fix bug where unconfirmed message sig is lost when locked. 
Fixes #484

Adds unsigned messages to the in-memory message list before showing the unlock message.
 2016-08-24 15:58:08 -07:00
Dan Finlay
8c06463e80 Linted 2016-08-24 15:46:31 -07:00
Dan Finlay
6041d6157a Bump changelog 2016-08-24 15:43:42 -07:00
Dan Finlay
44ff75c7e1 Improve msg signing padding 2016-08-24 15:43:00 -07:00
Dan Finlay
4f78ae56b2 Fix empty sign message bug 2016-08-24 15:40:40 -07:00
Dan Finlay
0fd955d636 Add pending sign msg development state 2016-08-24 15:40:22 -07:00
Dan Finlay
4e34796983 Merge branch 'master' into PopupNotifications 2016-08-24 15:03:09 -07:00
Kevin Serrano
af375d7f8a Naming issue. 2016-08-24 14:02:51 -07:00
Kevin Serrano
c82a494b4b Implement usage of nock. 2016-08-24 13:58:50 -07:00
Kevin Serrano
e42b35398b Changelog change. 2016-08-24 13:28:31 -07:00
Kevin Serrano
061fec1849 Now calls API functions with mock options. 2016-08-24 13:28:24 -07:00
Kevin Serrano
d3d634d09c Added mock option to function. 2016-08-24 13:28:06 -07:00
Kevin Serrano
55745c5980 Merge pull request #575 from MetaMask/shortcuts 
Shortcut to open MetaMask
 2016-08-24 11:40:02 -07:00
Kevin Serrano
c27ad468d1 Clarify shortcut. 2016-08-24 11:24:46 -07:00
Kevin Serrano
cf5b8ba388 Change shortcut again to Ctrl+Alt+M 2016-08-24 11:15:03 -07:00
Kevin Serrano
1444f5451f Change shortcut to Alt+M 2016-08-24 10:25:59 -07:00
Kevin Serrano
2a9b271703 Update changelog. 2016-08-23 16:54:25 -07:00
Kevin Serrano
9328e96d80 Add shortcut for opening MetaMask. 2016-08-23 16:53:05 -07:00
Dan Finlay
bc43e3d140 Merge branch 'master' into PopupNotifications 2016-08-23 16:02:06 -07:00
Dan Finlay
a0c7b0b1a2 Merge pull request #574 from MetaMask/fox-sub 
Sub static fox image when WebGL isn't supported
 2016-08-23 16:01:36 -07:00
Kevin Serrano
304b5b0b20 Remove gulp dependency. 2016-08-23 15:56:17 -07:00
Dan Finlay
65f7656487 Linted 2016-08-23 15:48:16 -07:00
Dan Finlay
671ca33abb Close notification on opening main UI 2016-08-23 15:44:50 -07:00
Kevin Serrano
d2c4227a31 Modify package.json. 2016-08-23 15:43:16 -07:00
Kevin Serrano
4bceda37a8 Merge branch 'master' into fox-sub 2016-08-23 14:51:09 -07:00
Kevin Serrano
00e8db31ce Update package.json 2016-08-23 14:47:37 -07:00
Kevin Serrano
050d0aecc6 Changelog. 2016-08-23 14:32:47 -07:00
Kevin Serrano
6363a80b49 Linting. 2016-08-23 14:32:12 -07:00
Kevin Serrano
5168232481 Created option to pass in static file for fallback for logo. 2016-08-23 14:11:25 -07:00
Dan Finlay
b3887ffd0a Skip popup dismissal in tests 2016-08-23 11:48:46 -07:00
Dan Finlay
983f3938da Linted 2016-08-23 11:42:54 -07:00
Dan Finlay
4fb49dfb4b Close popup even if last tx is dismissed from main UI 2016-08-23 11:40:08 -07:00
Dan Finlay
e5ca83d2bf Emit updates to all listeners on pending tx updates 
Previously the metamask controller only supported a single UI event listener, which wasn't useful for having a separate notification UI open at the same time.

Also reduced the notification's complexity down to a single method, which is heavily re-used.

Still has an outstanding bug where if the plugin ui dismisses the last tx, it does not close the notification popup.
 2016-08-23 11:15:56 -07:00
Dan Finlay
49ab51d825 Merge branch 'master' into PopupNotifications 2016-08-22 20:06:59 -07:00
kumavis
9dad3a5917 Merge pull request #573 from MetaMask/kumavis-patch-1 
inpage - cleanContextForImports fix
 2016-08-22 19:33:26 -07:00
kumavis
c97866e367 Merge branch 'master' into kumavis-patch-1 2016-08-22 19:23:01 -07:00