Dan Finlay
70edd00869
Merge branch 'master' into buyForm
2016-08-11 14:55:00 -07:00
kumavis
1ad9c78bbe
Merge pull request #533 from MetaMask/inpage-fixes
...
inpage and stream provider fixes
2016-08-11 14:44:28 -07:00
kumavis
7dcb3c64df
changelog - add note about web3-provider-stream fix
2016-08-11 14:42:02 -07:00
kumavis
c0f7c49105
inpage-prov - sync error - fix link
2016-08-11 14:35:55 -07:00
kumavis
a26d682976
deps - bump web3-stream-provider
2016-08-11 14:09:55 -07:00
kumavis
d7dffedf48
deps - local-message-stream extracted as module post-message-stream
2016-08-11 14:04:20 -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
Frankie
c8b2826441
Fix typo for copyButton
2016-08-10 15:07:10 -07:00
Frankie
4ace425a9c
Fix merge mess
2016-08-10 14:41:40 -07:00
Frankie
ba1edc429b
Merge branch 'master' into buyForm
2016-08-10 13:48:34 -07:00
Frankie
9c6dd9ef49
Create "buy form" add shape shift
2016-08-10 13:43:01 -07:00
Frankie
c48b60d7a6
Merge pull request #528 from MetaMask/checkout-fix
...
Fix ether warning checkbox to reflect proper behavior.
2016-08-10 11:03:10 -07:00
Kevin Serrano
db5779566b
Merge branch 'master' into checkout-fix
2016-08-10 10:58:47 -07:00
Kevin Serrano
abfc5632ef
Fix ether warning checkbox.
2016-08-10 10:54:55 -07:00
kumavis
ffb48028a3
Merge pull request #527 from MetaMask/tests
...
Add testem to devDependencies
2016-08-10 10:46:06 -07:00
Frankie
b81bacf22a
Add testem to devDependencies
2016-08-10 10:34:18 -07:00
Kevin Serrano
106cbc133f
Merge pull request #518 from MetaMask/typo-fix
...
Typo fix for apostrophes
2016-08-05 03:28:25 +09:00
Kevin Serrano
f42723c903
Add to changelog.
2016-08-04 11:24:25 -07:00
Kevin Serrano
31b38e820b
Fix typos with missing apostrophe
2016-08-04 11:14:39 -07:00
Frankie
d5cb1cb820
Merge pull request #517 from MetaMask/i#516
...
Fix #516 issue with dropdown menu
2016-08-04 06:04:15 -07:00
Frankie
f8ac9ca522
Fix issue with dropdown menu
2016-08-03 19:43:54 -07:00
Dan Finlay
5b76f6f8ae
Merge pull request #508 from MetaMask/FixAccountSelectionBug
...
Fix account selection bug
2016-07-29 13:31:39 -07:00
Dan Finlay
f9e81bdd99
Version 2.7.3
2016-07-29 13:28:26 -07:00
Dan Finlay
3a489baa71
Bump changelog
2016-07-29 13:28:10 -07:00
Dan Finlay
c9c8fbf2ec
Fix account selection updating
2016-07-29 13:27:39 -07:00
Dan Finlay
6d864e82ac
Merge pull request #507 from MetaMask/Version2.7.2
...
Version 2.7.2
2016-07-29 13:11:34 -07:00
Dan Finlay
019581bd1f
Version 2.7.2
2016-07-29 13:08:57 -07:00
Dan Finlay
212f9cf945
Merge pull request #506 from MetaMask/FixNetworkReference
...
Fix network name reference
2016-07-29 13:08:14 -07:00
Dan Finlay
c7691b7e64
Fix reference in drop menu item
2016-07-29 12:22:39 -07:00
Dan Finlay
8a4d8eca64
Fix network name reference
...
When adding the classic network to the menu, I left a reference to a property that is not always existent, so we needed a fallback for it.
2016-07-29 12:19:15 -07:00
kumavis
591fe3f9be
Merge pull request #498 from MetaMask/AddEthClassic
...
Add eth classic
2016-07-29 11:29:28 +09:00
Dan Finlay
6151339840
Merge branch 'master' into AddEthClassic
2016-07-28 15:47:22 -07:00
Dan Finlay
0b41248743
Merge pull request #500 from MetaMask/FixRemoteStoreBug
...
Fix broken reference to host store.didUpdate
2016-07-28 13:16:59 -07:00
Dan Finlay
ab320d12b4
Merge branch 'master' into AddEthClassic
2016-07-28 13:11:19 -07:00
Dan Finlay
0aad3216d4
Merge branch 'master' into FixRemoteStoreBug
2016-07-28 13:11:10 -07:00
Dan Finlay
910d326dbd
Merge pull request #502 from MetaMask/ParallelCopyTasks
...
Fix some gulp task issues
2016-07-28 13:10:42 -07:00
Dan Finlay
bdd2752cc7
Fix some gulp task issues
...
I know, I've been fixing up the gulp scripts all week. I keep fixing one thing then breaking another.
In this commit, I fix some issues with some previous approaches.
I no longer try to do the copying to `chrome` after `firefox`, I simply stream to both during copy and build tasks, and that logic is reused during dev and build tasks.
The `copyTask` function now supports an array of `destinations`, that allows piping to multiple destinations, which is pretty cool.
The `manifest:cleanup` task that chrome requires is now just part of the `copy` task, so we don't have to remember it everywhere we copy. So obvious it's like why only now.
2016-07-28 12:59:37 -07:00
Dan Finlay
5fdf375751
Merge pull request #501 from MetaMask/UpdateNodeDependency
...
Update readme node version
2016-07-28 12:23:12 -07:00
Dan Finlay
4715a55d0f
Update readme node version
2016-07-28 11:58:37 -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
da58125c5e
Merge branch 'master' into AddEthClassic
2016-07-28 11:11:13 -07:00
Dan Finlay
c805963a22
Linted
2016-07-28 11:10:54 -07:00
Dan Finlay
496b6b6e96
Merge pull request #499 from MetaMask/FixDevScripts
...
Fix dev tasks for multi browser copying
2016-07-28 11:08:31 -07:00
Dan Finlay
5feff0b1f5
Add missing reference for provider
2016-07-28 11:04:02 -07:00
Dan Finlay
5d83b9176b
Bump changelog
2016-07-28 10:54:25 -07:00
Dan Finlay
51535ab0cc
Fix margin on provider checkmarks
2016-07-28 10:54:00 -07:00
Dan Finlay
9b43ec2278
Add eth classic to provider menu
2016-07-28 10:53:51 -07:00
Dan Finlay
daaac17be2
Fix dev tasks for multi browser copying
2016-07-28 10:50:14 -07:00
Dan Finlay
a259dfad25
Merge pull request #497 from MetaMask/FixBuild
...
Fix nondeterministic build
2016-07-27 17:03:47 -07:00
