1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-24 11:01:41 +01:00
Commit Graph

440 Commits

Author SHA1 Message Date
Dan Finlay
e85418b11a Merge branch 'master' into EdgeCompatibility 2016-08-29 16:14:51 -07:00
Dan Finlay
bb8241f711 Version 2.10.0 2016-08-29 11:14:18 -07:00
Frankie
547894ed39 Merge branch 'master' into i#563forgotPassword 2016-08-25 16:06:54 -07:00
Dan Finlay
8b81009a30 Merge branch 'master' into PopupNotifications 2016-08-25 15:42:35 -07:00
Frankie
11c6c63d76 Merge branch 'master' into i#563forgotPassword 2016-08-25 14:17:29 -07:00
Frankie
483a7fee0a Add a back button on lock screen to go back to init menu 2016-08-25 14:13:32 -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
340d12f0cf Version 2.9.1 2016-08-24 16:32:15 -07:00
Dan Finlay
eee08457e5 Merge branch 'master' into i484PersistPendingSignatures 2016-08-24 16:15:43 -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
4e34796983 Merge branch 'master' into PopupNotifications 2016-08-24 15:03:09 -07:00
Kevin Serrano
c82a494b4b Implement usage of nock. 2016-08-24 13:58:50 -07:00
Kevin Serrano
d3d634d09c Added mock option to function. 2016-08-24 13:28:06 -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
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
671ca33abb Close notification on opening main UI 2016-08-23 15:44:50 -07:00
Kevin Serrano
4bceda37a8 Merge branch 'master' into fox-sub 2016-08-23 14:51:09 -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
c97866e367 Merge branch 'master' into kumavis-patch-1 2016-08-22 19:23:01 -07:00
kumavis
8b9999b71e inpage - cleanContextForImports fix
set to undefined instead of deleting
updates #447
2016-08-22 19:22:12 -07:00
kumavis
5c9ca21ba3 Merge branch 'master' into i390-TransactionLimit 2016-08-22 19:19:53 -07:00
kumavis
2f01ec5be2 Merge branch 'master' into i479 2016-08-22 19:14:58 -07:00
kumavis
b8077983d6 inpage provider - reassign incomming ids 2016-08-22 18:59:15 -07:00
Dan Finlay
75fd650f69 Merge branch 'master' into PopupNotifications 2016-08-22 17:18:53 -07:00
Dan Finlay
361e26fad7 Limit to one popup, re-focus on additional notifications. 2016-08-22 17:18:14 -07:00
Dan Finlay
6e1000f361 Merge branch 'master' into PopupNotifications 2016-08-22 15:03:36 -07:00
Kevin Serrano
bc2abd0a78 First part of chinese translation. 2016-08-22 14:11:32 -07:00
Kevin Serrano
18aef9570f Add spanish locales. 2016-08-22 14:07:02 -07:00
Dan Finlay
3d451ddf3e Merge branch 'master' into i390-TransactionLimit 2016-08-22 11:59:08 -07:00
Dan Finlay
31e0a3491b Version 2.9.0 2016-08-22 11:24:34 -07:00
Dan Finlay
7389f9d0a0 Enforce tx history limit 2016-08-18 15:40:56 -07:00
Frankie
3525dc0801 Create a ShapeShift tx in tx History 2016-08-18 15:20:26 -07:00
Frankie
efa61f2cf8 Merge branch 'master' into shapeshiftTx 2016-08-18 11:06:32 -07:00
Frankie
752d16f6c0 WIP: ShapeShift tx 2016-08-18 11:04:28 -07:00
Dan Finlay
dfaac78e39 Linted 2016-08-16 17:50:51 -07:00
Dan Finlay
a167bbc5a0 MVP Popup Notifications Working
I'm unsure which will be more performant: A notification using a trimmed down version of the UI, or using them both, letting the browser cache them both.

In any case, here I've modified the normal UI to recognize when it's a popup, and change the UX accordingly in a few ways:
 - Hide the menu bar
 - Hide the back button from the notifications view.
 - When confirming the last tx, close the window.
2016-08-16 17:32:54 -07:00
Dan Finlay
030bdec27a Unify notification and popup ui files 2016-08-16 16:46:44 -07:00
Dan Finlay
4ba90969ee Merge branch 'master' into PopupNotifications 2016-08-16 15:41:11 -07:00
Dan Finlay
5479509618 Set up MVP for popup-based notifications. 2016-08-16 15:39:40 -07:00
Kevin Serrano
666f3cd66c Added compliance for tests and properly accounts for N/A conversions. 2016-08-16 15:11:40 -07:00
Kevin Serrano
d43ac808ff Fix uncalled fn. 2016-08-16 14:28:32 -07:00
Kevin Serrano
6041ba1ed2 Add fallback to API failure. 2016-08-16 14:07:06 -07:00
Kevin Serrano
58e3042a3b Remove logging. Clean up duplicate entries in currency list. 2016-08-16 13:21:16 -07:00
Kevin Serrano
7725f38147 Merge branch 'master' into usd-conversion 2016-08-16 10:50:39 -07:00
Dan Finlay
e5f2c1a866 Version 2.8.0 2016-08-15 10:56:01 -07:00
Kevin Serrano
6895d330ff Merge master. 2016-08-15 10:50:53 -07:00
Dan Finlay
e826eb932c Remove ethereum classic provider
Fixes #542
2016-08-14 18:41:05 -07:00
kumavis
0b660f4ac8 deps - extracted ensnare to module 2016-08-12 13:25:38 -07:00
Kevin Serrano
b1f68ec9cd Add global var for background. 2016-08-11 19:44:59 -07:00
Kevin Serrano
1e54a1b5e8 Merge github.com:MetaMask/metamask-plugin into logging-fix 2016-08-11 19:05:22 -07:00
Kevin Serrano
2b0c6953e2 Create global variable that changes ui logging. 2016-08-11 18:58:23 -07:00
Kevin Serrano
b8856d765d Setting defaults to production. 2016-08-11 15:42:21 -07:00
kumavis
c0f7c49105 inpage-prov - sync error - fix link 2016-08-11 14:35:55 -07:00
Kevin Serrano
243d83dd33 Separate developmentMode conditional to only wrap log. 2016-08-11 14:24:35 -07:00
Kevin Serrano
ad468c1880 Merge branch 'master' into logging-fix 2016-08-11 14:07:49 -07:00
kumavis
d7dffedf48 deps - local-message-stream extracted as module post-message-stream 2016-08-11 14:04:20 -07:00
Kevin Serrano
804e8df87f Lint 2016-08-11 14:03:51 -07:00
Kevin Serrano
9904b4ef5a Add ability to hide logging messages in production. 2016-08-11 13:59:14 -07:00
kumavis
53b1334d37 clean -formatting 2016-08-11 13:31:00 -07:00
kumavis
3417c421c8 inpage-provider - remove createSyncProvider, just fail 2016-08-11 13:23:49 -07:00
Kevin Serrano
abfc5632ef Fix ether warning checkbox. 2016-08-10 10:54:55 -07:00
Kevin Serrano
cb0c1f25ba Did not previously call functions before! 2016-08-09 16:49:15 -07:00
Kevin Serrano
637d3978b7 Fix default value. Add loading indication for async. 2016-08-09 16:33:58 -07:00
Kevin Serrano
8acb3e6007 Enable full listing of supported currencies by Cryptonator. 2016-08-09 09:48:08 -07:00
Dan Finlay
3597759151 Add MSFT Edge keys to manifest.json 2016-08-07 13:35:07 -07:00
Kevin Serrano
260de6532c Get fiat numbers rendering on tooltip. Need to find way to create line breaks. 2016-08-05 12:18:44 -07:00
Kevin Serrano
479abadaa7 Merge branch 'master' into usd-conversion 2016-08-04 13:26:03 -07:00
Dan Finlay
f9e81bdd99 Version 2.7.3 2016-07-29 13:28:26 -07:00
Dan Finlay
c9c8fbf2ec Fix account selection updating 2016-07-29 13:27:39 -07:00
Dan Finlay
019581bd1f Version 2.7.2 2016-07-29 13:08:57 -07:00
Dan Finlay
6151339840 Merge branch 'master' into AddEthClassic 2016-07-28 15:47:22 -07:00
Dan Finlay
5ceed48db9 Fix broken reference to host store.didUpdate
I'd returned this line because it seemed to fix Firefox compatibility, now it seems like that wasn't the case.  Removing it again.
2016-07-28 11:53:33 -07:00
Dan Finlay
9b43ec2278 Add eth classic to provider menu 2016-07-28 10:53:51 -07:00
Dan Finlay
43784e2143 Version 2.7.1 2016-07-27 16:49:11 -07:00
Dan Finlay
7fe3170c6f Enhance manifest details 2016-07-26 17:02:54 -07:00
Dan Finlay
407d2e884b Merge remote-tracking branch 'origin/Version2.7.0' into FixChromeBuild 2016-07-26 17:01:48 -07:00
Dan Finlay
2368c2993d Add platform specific builds and zip tasks (#486)
* Add platform specific folders to dist folder

* Remove gulp hacks

* Add platform specific bundling

dev and dist tasks now build into platform-specific folders within the `dist` folder.

Added tasks `gulp zip` and `gulp dist`.

`zip` builds the platform-specific folders into platform-specific bundles within the `dist` folder.

`dist` builds and then zips all at once.

* Fix chrome bundle zipping

* Fix broken reference in eth warning

* Fix but where web3.eth.accounts are not available in firefox.

* Bump changelog
2016-07-26 15:15:40 -07:00
Dan Finlay
b43b9f13e9 Fix integration tests 2016-07-25 17:47:14 -07:00
Dan Finlay
be74589f49 Fix extension tests 2016-07-25 17:33:22 -07:00
Dan Finlay
913a9e85bd Inject inpage script synchronously
Huge thanks to the Firefox team, for their help on the issue of our long-standing inpage script race condition.

http://stackoverflow.com/questions/38577656/how-can-i-make-a-firefox-add-on-contentscript-inject-and-run-a-script-before-oth

The problem is that we were injecting a `script` tag and assigning its `src` attribute, which triggers an asynchronous fetch request, and does not guarantee execution order! (That was news to me!)

Instead, I'm now assigning the `script` tag a `textContent` value of the script to inject, and it seems to fix the problem!

There is also a Firefox-only API that could solve this whole problem in an even more elegant way, so we might want to expose a code path for that solution later on:

https://developer.mozilla.org/en-US/docs/Mozilla/Tech/XPCOM/Language_Bindings/Components.utils.exportFunction

Allows you to expose an object from one scope to another. There was even talk of creating a polyfill for it that does virtually what we do, message passing between contexts.
2016-07-25 16:38:07 -07:00
Dan Finlay
b07bbc14e1 Clean up extension polyfill abstraction 2016-07-25 13:46:33 -07:00
Dan Finlay
f3ea891e72 Allow page injection to look for cross-browser APIs appropriately 2016-07-25 13:28:38 -07:00
Kevin Serrano
86832e6feb Fix merge conflicts. Fix typos. Ensure currency immediately updated on load. 2016-07-22 11:15:47 -07:00
Kevin Serrano
22528002e1 Linting! 2016-07-22 10:15:39 -07:00
Kevin Serrano
0bbfedc2bf Manifest fix for firefox-specific field (#475)
* Remove firefox-only manifest.json line.

* Changelog change.
2016-07-21 16:50:51 -07:00
Kevin Serrano
a612fcee64 Change function names. Add interval polling for api. Refactor functions. 2016-07-21 16:44:50 -07:00
Kevin Serrano
716e65424d Add date access throughout the data flow. 2016-07-21 14:08:26 -07:00
Dan Finlay
5d93e8fa74 Version 2.7.0 2016-07-21 13:42:09 -07:00
Frankie
fcd523abe4 Buy button (#474)
* WIP: Buy button link

* Add buy eth and the buy eth warning message

* Add css

* Move the opening of coinbase page to background
 and send to faucet if on test net

* Create a Warning about storeing eth

* Finish Buy button and Eth store warning screen

* Add to CHANGELOG

* fix frankies deletion and change chrome to extension
2016-07-21 13:41:10 -07:00