Merge branch 'master' into bugs/ui

This commit is contained in:
bechi 2014-09-03 10:39:09 -03:00
commit 2d33dcfef6
40 changed files with 520 additions and 3158 deletions

View file

@ -0,0 +1,21 @@
<div ng-controller="CopayersController">
<div class="copay-box" ng-repeat="copayer in copayersList()">
<img
class="br100 online"
src="./img/satoshi.gif"
alt="{{copayer.peerId}}"
width="70">
<div
class="ellipsis"
tooltip="ID: {{copayer.peerId}}"
tooltip-placement="bottom">
<small class="text-gray" ng-show="copayer.index == 0"><i class="fi-check m5r"></i>Me</small>
<small class="text-gray" ng-show="copayer.index > 0"><i class="fi-check m5r"></i>{{copayer.nick}}</small>
</div>
<div class="success label m10t" ng-show="isBackupReady(copayer)">
Ready
</div>
</div>
</div>