Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into FixSvgIcons | Dan Finlay | 2016-07-12 | 1 | -0/+14 |
|\ | |||||
| * | Integrate changes back into eth-balance | Kevin Serrano | 2016-07-12 | 1 | -0/+14 |
| | | |||||
* | | Add coin sending tx state | Dan Finlay | 2016-07-12 | 1 | -0/+1 |
|/ | |||||
* | Resolve merge conflict. | Kevin Serrano | 2016-07-08 | 4 | -0/+87 |
|\ | |||||
| * | Merge branch 'master' of github.com:MetaMask/metamask-plugin into ↵ | kumavis | 2016-07-08 | 1 | -0/+112 |
| |\ | | | | | | | | | | ConfirmationStyle | ||||
| * | | Fixed up pending-tx-details | Dan Finlay | 2016-07-07 | 1 | -0/+1 |
| | | | |||||
| * | | Fleshed out pending tx view | Dan Finlay | 2016-07-07 | 1 | -0/+0 |
| | | | |||||
| * | | Began reworking tx conf view | Dan Finlay | 2016-07-07 | 3 | -0/+86 |
| | | | |||||
* | | | Add new component for tx-history to avoid messing with other styles. Add ↵ | Kevin Serrano | 2016-07-08 | 1 | -1/+1 |
| | | | | | | | | | | | | fixed width specifically to this style. | ||||
* | | | Modified test views again. Added fixed length to center tx information. | Kevin Serrano | 2016-07-08 | 1 | -2/+2 |
| | | | |||||
* | | | Modify development states to account for long domains. | Kevin Serrano | 2016-07-08 | 1 | -2/+2 |
| |/ |/| | |||||
* | | Add new test state with tx history. Fix alignment issue with transaction ↵ | Kevin Serrano | 2016-07-08 | 1 | -0/+112 |
|/ | | | | history text. | ||||
* | Cleaned up some formatting for ui mocker | Dan Finlay | 2016-07-01 | 1 | -2/+2 |
| | |||||
* | First simple version of ui mocker | Dan Finlay | 2016-07-01 | 9 | -0/+584 |