kumavis
d892fffce2
Merge branch 'master' of github.com:MetaMask/metamask-plugin into fastinject
2016-07-06 20:52:28 -07:00
kumavis
5c4c902c94
appease the linting gods
2016-07-06 20:32:36 -07:00
Dan Finlay
a038eed6e3
Merge pull request #402 from MetaMask/z-position-fix
...
Fix dropdown z-index issue.
2016-07-06 20:24:28 -07:00
kumavis
ec5adf014e
changelog - add web3 min dist
2016-07-06 20:22:20 -07:00
kumavis
2f33c0a019
Merge branch 'master' of github.com:MetaMask/metamask-plugin into fastinject
2016-07-06 20:21:09 -07:00
kumavis
7aa120e630
web3 injection - use web3 dist for faster injection
2016-07-06 20:20:40 -07:00
Kevin Serrano
acdd40e3be
Fix dropdown z-index issue.
2016-07-06 20:11:49 -07:00
Dan Finlay
fb363b8a62
Merge pull request #401 from MetaMask/ethBalance
...
Handle to small of balances with "<0.00001"
2016-07-06 20:05:44 -07:00
Frankie
8834548b01
Handle to small of balances with "<0.00001"
2016-07-06 19:17:32 -07:00
Dan Finlay
689bd58d81
Merged latest balance formatting code
2016-07-06 18:06:28 -07:00
Dan Finlay
525abb85d4
Merge pull request #399 from MetaMask/ethBalance
...
Eth balance
2016-07-06 18:01:22 -07:00
Dan Finlay
15afbe5b1f
Merge branch 'master' into ConfirmationStyle
2016-07-06 17:59:00 -07:00
Dan Finlay
7058dc4ee3
Began reworking tx conf view
2016-07-06 17:58:46 -07:00
Frankie
53eefc1efc
Add a postion option for tool tip
2016-07-06 17:12:33 -07:00
Frankie
9d577ea023
Add decimal hendeling to ETH balance
2016-07-06 17:04:09 -07:00
Kevin Serrano
9d54f10dc5
Merge pull request #392 from MetaMask/kumavis-patch-1
...
readme - camel case MetaMask
2016-07-06 11:08:00 -07:00
kumavis
39175ba837
readme - camel case MetaMask
2016-07-06 11:04:26 -07:00
Dan Finlay
fb5dbd23a9
Merge pull request #387 from MetaMask/ui-formatting
...
Ui formatting for account details
2016-07-06 11:00:32 -07:00
Dan Finlay
dd9957d2b2
Merge pull request #388 from MetaMask/script-edits
...
Edits to the video script
2016-07-05 16:22:32 -07:00
Dan Finlay
61f2e265c0
Merge pull request #389 from MetaMask/thinFont
...
Thin font
2016-07-05 16:17:50 -07:00
Frankie
1f1737a63e
Merge branch 'master' into thinFont
2016-07-05 15:40:42 -07:00
Frankie
8d67a820a9
Add light and ultraLight fonts
2016-07-05 15:39:51 -07:00
Kevin Serrano
5c703deb2c
Edits to the script ya know.
2016-07-05 15:33:32 -07:00
Dan Finlay
2c89cd722e
Simplify empty account balance rendering
2016-07-05 15:16:40 -07:00
Dan Finlay
25598f1b6f
Merge pull request #385 from MetaMask/ImprovedLogging
...
Improve metamask-controller error logging
2016-07-05 12:33:21 -07:00
Kevin Serrano
04c4dad890
Add to changelog.
2016-07-05 12:08:08 -07:00
Kevin Serrano
3ca20bd8a3
Move account balance down a row. Adjusted positioning of buttons.
2016-07-05 12:04:15 -07:00
Dan Finlay
c4cbe3ad4c
Add video script draft
2016-07-05 11:52:38 -07:00
Dan Finlay
977e8611d6
Add state list rebuilding on ui task
2016-07-05 11:15:30 -07:00
Dan Finlay
c0b0c9c028
Simplify error log
2016-07-05 09:51:33 -07:00
Dan Finlay
1d8d7d833d
Improve metamask-controller error logging
...
Fixes #384
2016-07-05 09:06:33 -07:00
Dan Finlay
76c473538a
Version 2.5.0
2016-07-01 20:15:27 -07:00
Dan Finlay
f9d646f791
Merge pull request #383 from MetaMask/i377
...
Put network status checkmarks at end of row
2016-07-01 15:14:30 -07:00
Dan Finlay
71df05c5ff
Put network status checkmarks at end of row
2016-07-01 15:04:38 -07:00
Dan Finlay
239165ff81
Merge pull request #381 from MetaMask/ImproveUiDevMode
...
Improved Ui Dev Mode
2016-07-01 14:48:51 -07:00
Dan Finlay
0cd11915ce
Improved Ui Dev Mode
...
Dev mode now reloads on file changes (although it seems to sometimes reload too soon, not getting the update... we can tune the timeout interval in development/index.html)
Dev mode now reloads on all non-`node_modules` file changes, so the `ui` and `app` folders are both being watched for live reloading.
2016-07-01 14:23:37 -07:00
Dan Finlay
c75543dac8
Merge pull request #380 from MetaMask/FrankieDisclaimer
...
Frankie disclaimer
2016-07-01 11:51:17 -07:00
Dan Finlay
287222df25
Linted
2016-07-01 10:32:54 -07:00
Dan Finlay
51a5e66cbb
Move main drop-down state to component state
2016-07-01 10:25:19 -07:00
Dan Finlay
6ec387b675
Formatted dev mode better
2016-06-30 23:50:20 -07:00
Dan Finlay
7f9200b1bf
Added some basic styles
2016-06-30 23:15:45 -07:00
Dan Finlay
50afc386e5
Simplify ui task command
2016-06-30 23:15:38 -07:00
Dan Finlay
d1545245c2
Clean up beefy usage
...
Now properly uses brfs transform so it can reload on state object changes.
2016-06-30 22:59:28 -07:00
kumavis
9a46988ea8
Merge branch 'FrankieDisclaimer' of github.com:MetaMask/metamask-plugin into FrankieDisclaimer
2016-06-30 21:46:31 -07:00
kumavis
5a917431d8
disclaimer - render via react-markdown
2016-06-30 21:46:19 -07:00
Dan Finlay
a95b5c4a96
Add query param restoring to mocker
2016-06-30 21:39:50 -07:00
Dan Finlay
c3f18fcf2b
Remove debugs from development
2016-06-30 21:35:24 -07:00
Dan Finlay
cd21a4b699
Remove scroll fixing from ui preview
2016-06-30 21:32:50 -07:00
Dan Finlay
a0a676c3e2
Remove old disclaimer
2016-06-30 21:24:14 -07:00
Dan Finlay
d33d4f0654
Merge branch 'master' into FrankieDisclaimer
2016-06-30 21:22:39 -07:00