Kevin Serrano
|
6895d330ff
|
Merge master.
|
2016-08-15 10:50:53 -07:00 |
Dan Finlay
|
271e3c4fdf
|
Merge pull request #547 from MetaMask/cssFixes
Add margin to "go to test faucet" button and show more of the address…
|
2016-08-14 22:41:23 -07:00 |
Frankie
|
2ef4cbaa89
|
Add margin to "go to test faucet" button and show more of the address on qr code page
|
2016-08-14 21:41:08 -07:00 |
kumavis
|
9b1a3fd7f3
|
Merge pull request #544 from MetaMask/RemoveEtc
Remove ethereum classic provider
|
2016-08-14 18:48:17 -07:00 |
Dan Finlay
|
e826eb932c
|
Remove ethereum classic provider
Fixes #542
|
2016-08-14 18:41:05 -07:00 |
|
kumavis
|
f7a5a4e170
|
Merge pull request #529 from MetaMask/buyForm
Buy form
|
2016-08-14 08:18:20 -07:00 |
|
Frankie
|
31d6d5c509
|
Add to change log
|
2016-08-13 13:48:49 -07:00 |
|
Frankie
|
99a788a6f0
|
Add multi message capability to Qr view for market info
|
2016-08-12 17:43:24 -07:00 |
|
Frankie
|
b72c00a6c1
|
Add a to test faucet button
|
2016-08-12 16:12:40 -07:00 |
|
Frankie
|
bf7435926f
|
Merge branch 'buyForm' of https://github.com/MetaMask/metamask-plugin into buyForm
|
2016-08-12 15:48:18 -07:00 |
|
Frankie
|
632465b213
|
Merge branch 'master' into buyForm
|
2016-08-12 15:47:03 -07:00 |
|
Frankie
|
b4c9a52259
|
Change buy forms so that they are their own view and add Qr-code
|
2016-08-12 15:41:59 -07:00 |
|
Kevin Serrano
|
4572e689cf
|
Merge pull request #538 from MetaMask/i512
deps - extracted ensnare to module
|
2016-08-12 13:29:17 -07:00 |
kumavis
|
0b660f4ac8
|
deps - extracted ensnare to module
|
2016-08-12 13:25:38 -07:00 |
|
kumavis
|
4f4c78a9fc
|
Merge pull request #535 from MetaMask/CustomRpcLoadingBug
Custom rpc loading bug
|
2016-08-11 20:56:11 -07:00 |
|
kumavis
|
8943e86470
|
Merge branch 'master' into CustomRpcLoadingBug
|
2016-08-11 20:53:15 -07:00 |
|
kumavis
|
878a01a294
|
Merge pull request #532 from MetaMask/logging-fix
Logging fix
|
2016-08-11 20:50:01 -07:00 |
|
Dan Finlay
|
a5cfa937ef
|
Add state selector to mock-dev server used by UI tests
|
2016-08-11 19:45:47 -07:00 |
|
Dan Finlay
|
f3faec6509
|
Added buggy state file to states folder
|
2016-08-11 19:45:20 -07:00 |
|
Kevin Serrano
|
b1f68ec9cd
|
Add global var for background.
|
2016-08-11 19:44:59 -07:00 |
|
Dan Finlay
|
20cfd1c9f3
|
Add network indicator class to loading image
|
2016-08-11 19:44:41 -07:00 |
|
Kevin Serrano
|
1e54a1b5e8
|
Merge github.com:MetaMask/metamask-plugin into logging-fix
|
2016-08-11 19:05:22 -07:00 |
|
Kevin Serrano
|
041538e89e
|
UI logging supressed for production.
|
2016-08-11 19:04:50 -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 |
|
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 |
|
Kevin Serrano
|
243d83dd33
|
Separate developmentMode conditional to only wrap log.
|
2016-08-11 14:24:35 -07:00 |
|
Kevin Serrano
|
b3def32f7a
|
Cosmetic difference.
|
2016-08-11 14:22:48 -07:00 |
|
Kevin Serrano
|
ec2641a8c9
|
Remove stray console.log
|
2016-08-11 14:21:44 -07:00 |
|
Kevin Serrano
|
0056844335
|
Take out unused dependency.
|
2016-08-11 14:20:26 -07:00 |
|
Kevin Serrano
|
bf384da6f3
|
Remove comments.
|
2016-08-11 14:12:55 -07:00 |
|
kumavis
|
a26d682976
|
deps - bump web3-stream-provider
|
2016-08-11 14:09:55 -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 |
|
Frankie
|
2fc26fb264
|
Even out some of the margins
|
2016-08-10 18:53:11 -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 |