Kevin Serrano
|
068bd7d40a
|
Merge branch 'master' into livereload
|
2016-09-02 14:15:24 -07:00 |
|
Kevin Serrano
|
f9f821e726
|
Changelog add.
|
2016-09-02 14:15:15 -07:00 |
|
Kevin Serrano
|
2d0077d5c6
|
Changelog add and rename vars.
|
2016-09-02 14:15:00 -07:00 |
|
Kevin Serrano
|
b4334a72b4
|
Refactor for spreading. Add conditionals for livereload.
|
2016-09-02 14:00:36 -07:00 |
|
kumavis
|
c2a1b442e9
|
Version 2.10.2
|
2016-09-02 13:51:22 -07:00 |
|
Kevin Serrano
|
bdc7fd7c6f
|
Merge pull request #607 from MetaMask/notif-fix
notif - use standard err-first callback style
|
2016-09-02 13:45:29 -07:00 |
|
Kevin Serrano
|
822198e092
|
Merge branch 'master' into notif-fix
|
2016-09-02 13:36:07 -07:00 |
|
kumavis
|
891e17c44c
|
notif - use standard err-first callback style
|
2016-09-02 13:29:47 -07:00 |
|
kumavis
|
7583bbf937
|
Merge pull request #606 from MetaMask/2.10.1
Version 2.10.1
|
2016-09-02 12:54:58 -07:00 |
|
kumavis
|
8b37bcf16b
|
Version 2.10.1
|
2016-09-02 12:48:50 -07:00 |
|
Kevin Serrano
|
c02be4fa66
|
Add production flag. Conditionally copy reload based on production.
|
2016-09-01 15:19:31 -07:00 |
|
Kevin Serrano
|
168b4c5bc0
|
Install deps. Fix chrome/firefox typo.
|
2016-09-01 15:01:45 -07:00 |
|
Kevin Serrano
|
a76e198c9c
|
Merge pull request #603 from MetaMask/i566-NoPopupWhenOpen
Don't show popup when sending tx from within metamask
|
2016-09-01 11:39:08 -07:00 |
|
Dan Finlay
|
34fd23803d
|
Merge branch 'master' into i566-NoPopupWhenOpen
|
2016-09-01 11:34:38 -07:00 |
|
Dan Finlay
|
a6e3357d22
|
Bump changelog
|
2016-09-01 11:33:54 -07:00 |
|
Dan Finlay
|
4f614d0852
|
Linted
|
2016-09-01 11:31:39 -07:00 |
|
Dan Finlay
|
7b1bbb7a19
|
Show conf screen after send request
|
2016-09-01 11:30:42 -07:00 |
|
Dan Finlay
|
7f947f8ab2
|
Skip loading indication from send screen
|
2016-09-01 11:29:17 -07:00 |
|
Dan Finlay
|
47b2ae1c5f
|
Do not open popup for internally produced txs
|
2016-09-01 11:26:27 -07:00 |
|
Dan Finlay
|
32345bda77
|
Merge pull request #601 from MetaMask/filterfix
inpage - remap ids on response
|
2016-08-31 16:16:08 -07:00 |
|
kumavis
|
532737a101
|
inpage - remap ids on response
|
2016-08-31 15:40:05 -07:00 |
|
kumavis
|
2f289fb115
|
Merge branch 'library' of github.com:MetaMask/metamask-plugin into library
|
2016-08-31 15:33:45 -07:00 |
|
kumavis
|
a3330568d9
|
various things
|
2016-08-31 15:33:24 -07:00 |
|
Dan Finlay
|
d26dd53fe1
|
Merge pull request #600 from MetaMask/i597-ModifyInfuraUrls
Add metamask route to infura urls
|
2016-08-31 11:31:23 -07:00 |
|
Dan Finlay
|
44545e0f47
|
Add metamask route to infura urls
Fixes #597
Allows metamask-specific RPC metrics.
|
2016-08-31 11:10:25 -07:00 |
|
kumavis
|
791e80988d
|
Merge pull request #596 from MetaMask/EdgeCompatibility
Edge compatibility
|
2016-08-29 18:27:55 -07:00 |
|
Dan Finlay
|
c15eef9425
|
Make element enumeration Edge compatible
|
2016-08-29 17:34:29 -07:00 |
|
Dan Finlay
|
e4e7489dd9
|
Add test for Edge compatibility
|
2016-08-29 17:34:12 -07:00 |
|
Dan Finlay
|
fd5dad136f
|
Remove old notification cleanup code
|
2016-08-29 17:33:56 -07:00 |
|
Dan Finlay
|
742a0e0dfe
|
Make popup a type Edge supports
|
2016-08-29 17:33:35 -07:00 |
|
Dan Finlay
|
1b617402ec
|
Add extra edge compatibility
|
2016-08-29 17:33:18 -07:00 |
|
Dan Finlay
|
b36b760338
|
Fix console.error references
Microsoft edge does not support console.error.bind, nor is that call necessary here.
|
2016-08-29 17:32:39 -07:00 |
|
Dan Finlay
|
6838027c65
|
Remove bind calls from console errors
|
2016-08-29 16:49:58 -07:00 |
|
Dan Finlay
|
fb6476224f
|
Add tolerance for failed form persisting
|
2016-08-29 16:40:57 -07:00 |
|
Dan Finlay
|
e85418b11a
|
Merge branch 'master' into EdgeCompatibility
|
2016-08-29 16:14:51 -07:00 |
|
kumavis
|
a9c738d4d3
|
Merge pull request #594 from MetaMask/i541-CustomMenuItemFix
Allow selecting custom rpc from menu even when custom rpc is selected
|
2016-08-29 12:49:17 -07:00 |
|
Dan Finlay
|
e39513ff18
|
Bump changelog
|
2016-08-29 12:37:38 -07:00 |
|
Dan Finlay
|
a804629606
|
Show custom rpc menu item always
|
2016-08-29 12:36:47 -07:00 |
|
Dan Finlay
|
f5baf36c07
|
Make custom network dev state not loading
|
2016-08-29 12:36:27 -07:00 |
|
Dan Finlay
|
47429fcbf5
|
Merge pull request #593 from MetaMask/Version-2.10.0
Version 2.10.0
|
2016-08-29 11:17:13 -07:00 |
|
Dan Finlay
|
bb8241f711
|
Version 2.10.0
|
2016-08-29 11:14:18 -07:00 |
|
Dan Finlay
|
81da958761
|
Add a port log to server start
|
2016-08-26 19:15:20 -07:00 |
|
kumavis
|
b7aab95519
|
library - basic test server + partial safari fixes
|
2016-08-26 17:39:19 -07:00 |
|
Dan Finlay
|
7af18a4b55
|
Merge pull request #591 from MetaMask/SpellingFix
Fix spelling error
|
2016-08-26 15:26:07 -07:00 |
|
Dan Finlay
|
62179a37f7
|
Fix spelling error
|
2016-08-26 15:08:02 -07:00 |
|
Dan Finlay
|
9497d282c7
|
Merge pull request #588 from MetaMask/i#563forgotPassword
Add a back button for Lock screen
|
2016-08-26 11:52:43 -07:00 |
|
Frankie
|
ae33586660
|
make the back button its own function
|
2016-08-26 11:30:07 -07:00 |
|
kumavis
|
23a144fb8b
|
library - popup handler demo
|
2016-08-26 11:08:23 -07:00 |
|
Frankie
|
547894ed39
|
Merge branch 'master' into i#563forgotPassword
|
2016-08-25 16:06:54 -07:00 |
|
Frankie
|
250cf8cc23
|
Change style on back button to be more like the rest of the app
|
2016-08-25 16:05:44 -07:00 |
|