BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix conflict

This commit is contained in:
Bechi 2014-05-28 18:17:43 -03:00
parent 836faeee29 4e54c26c3d
commit ecbd4cf4f7
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
index.html
View File

@ -191,9 +191,11 @@
<div ng-show="!wallets.length"> <div ng-show="!wallets.length">
<h3>Create a new wallet</h3> <h3>Create a new wallet</h3>
<form name="createForm" ng-submit="create(createForm)" novalidate> <form name="createForm" ng-submit="create(createForm)" novalidate>
<input type="text" class="form-control" ng-model="walletName" name="walletName" placeholder="Wallet name (optional)"> <p class="text-gray">
<input type="password" class="form-control" placeholder="Choose your password" name="createPassword" ng-model="createPassword" check-strength="createPassword" required> Copay is a free, open-source, multisignature bitcoin wallet. A single-owner bitcoin wallet's security depends on carefully securing the private keys. With copay you can have multiple people controlling the funds, using bitcoin's multisignature functionality, requiring no trust in any third party.
<button type="submit" class="button secondary radius" ng-disabled="createForm.$invalid || loading" loading="Creating">Create</button> </p>
<button type="submit" class="button secondary radius"
ng-disabled="createForm.$invalid || loading" loading="Creating">Create</button>
</form> </form>
</div> </div>
</div> </div>
@ -271,6 +273,7 @@
<div ng-show="!loading"> <div ng-show="!loading">
<form name="setupForm" ng-submit="create(setupForm)" novalidate> <form name="setupForm" ng-submit="create(setupForm)" novalidate>
<div class="small-12 medium-8 medium-centered large-8 large-centered columns box-setup"> <div class="small-12 medium-8 medium-centered large-8 large-centered columns box-setup">
<h3>Create new wallet</h3>
<div class="large-6 columns line-dashed-v"> <div class="large-6 columns line-dashed-v">
<h6>Select total number of copayers</h6> <h6>Select total number of copayers</h6>
<select ng-model="totalCopayers" ng-options="totalCopayers as totalCopayers for totalCopayers in TCValues"> <select ng-model="totalCopayers" ng-options="totalCopayers as totalCopayers for totalCopayers in TCValues">
@ -291,16 +294,17 @@
</div> </div>
</div> </div>
<div class="small-12 medium-6 medium-centered large-6 large-centered columns m30v"> <div class="small-12 medium-6 medium-centered large-6 large-centered columns m30v">
<h6>Your Wallet Password (you don't need to share this) <small>Required</small></h6> <h6>Your Wallet Password<small>(doesn't need to be shared) Required</small></h6>
<input type="password" class="form-control" ng-model="walletPassword" check-strength="walletPassword" required> <input type="password" placeholder="Choose your password" class="form-control"
ng-model="walletPassword" check-strength="walletPassword" required>
</div> </div>
<div class="small-12 medium-6 medium-centered large-6 large-centered columns m30v"> <div class="small-12 medium-6 medium-centered large-6 large-centered columns m30v">
<h6>Wallet name <small>Optional</small></h6> <h6>Wallet name <small>Optional</small></h6>
<input type="text" class="form-control" ng-model="walletName"> <input type="text" placeholder="Family vacation funds" class="form-control" ng-model="walletName">
</div> </div>
<div class="small-12 medium-6 medium-centered large-6 large-centered columns m30v"> <div class="small-12 medium-6 medium-centered large-6 large-centered columns m30v">
<h6>Your name <small>Optional</small></h6> <h6>Your name <small>Optional</small></h6>
<input type="text" class="form-control" ng-model="myNickname"> <input type="text" placeholder="Bob" class="form-control" ng-model="myNickname">
</div> </div>
</div> </div>
<div class="large-12 columns line-dashed"> <div class="large-12 columns line-dashed">

9
js/controllers/signin.js
View File

@ -13,15 +13,6 @@ angular.module('copay.signin').controller('SigninController',
$scope.openPassword = ''; $scope.openPassword = '';
$scope.create = function(form) { $scope.create = function(form) {
if (form && form.$invalid) {
$rootScope.$flashMessage = { message: 'Please, enter required fields', type: 'error'};
return;
}
$rootScope.walletName = form.walletName.$modelValue;
$rootScope.walletPassword = form.createPassword.$modelValue;
$location.path('setup'); $location.path('setup');
}; };

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "copay", "name": "copay",
"version": "0.0.5", "version": "0.0.6",
"description": "A multisignature wallet", "description": "A multisignature wallet",
"repository": { "repository": {
"type": "git", "type": "git",