aboutsummaryrefslogtreecommitdiffstats
path: root/development/states
Commit message (Expand)AuthorAgeFilesLines
* Resolve merge conflict.Kevin Serrano2016-07-084-0/+87
|\
| * Merge branch 'master' of github.com:MetaMask/metamask-plugin into Confirmatio...kumavis2016-07-081-0/+112
| |\
| * | Fixed up pending-tx-detailsDan Finlay2016-07-071-0/+1
| * | Fleshed out pending tx viewDan Finlay2016-07-071-0/+0
| * | Began reworking tx conf viewDan Finlay2016-07-073-0/+86
* | | Add new component for tx-history to avoid messing with other styles. Add fixe...Kevin Serrano2016-07-081-1/+1
* | | Modified test views again. Added fixed length to center tx information.Kevin Serrano2016-07-081-2/+2
* | | Modify development states to account for long domains.Kevin Serrano2016-07-081-2/+2
| |/ |/|
* | Add new test state with tx history. Fix alignment issue with transaction hist...Kevin Serrano2016-07-081-0/+112
|/
* Cleaned up some formatting for ui mockerDan Finlay2016-07-011-2/+2
* First simple version of ui mockerDan Finlay2016-07-019-0/+584