BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,702 Commits 8 Branches 122 Tags 162 MiB
Commit Graph

847 Commits

Author SHA1 Message Date
Gustavo Maximiliano Cortez b94f66f32e Fixed Conflicts: 
bower.json
	js/directives.js
	views/includes/sidebar.html
 2014-08-01 11:12:35 -03:00
Gustavo Maximiliano Cortez 854196e72a Merge pull request #989 from yemel/feature/pre-created-address 
Add a pre-generated address to the shared branch
 2014-08-01 11:04:58 -03:00
Yemel Jardi ba504f147d Merge pull request #976 from cmgustavo/feature/01-timeout 
Automatically logout wallet after 15 minutes of inactivity
 2014-08-01 10:56:23 -03:00
Gustavo Maximiliano Cortez d2ae49f9a5 Fixes: typo 2014-08-01 10:51:26 -03:00
Gustavo Maximiliano Cortez fc71e6a441 Fixes: typo 2014-08-01 10:44:33 -03:00
Gustavo Maximiliano Cortez 2784e19cb2 Merge pull request #988 from yemel/fix/open-external 
Fix open external in new tab and fix typo
 2014-08-01 10:23:26 -03:00
Gustavo Maximiliano Cortez 09286ec37d Merge pull request #986 from yemel/feature/ui-locked-balance 
Change available balance to locked
 2014-08-01 10:16:00 -03:00
Yemel Jardi 59a03c1f25 Change available balance to locked 2014-08-01 10:09:26 -03:00
Gustavo Maximiliano Cortez f9161ed8f2 Fix Conflicts: 
css/main.css
 2014-07-31 23:10:38 -03:00
Gustavo Maximiliano Cortez dbf812f848 Fix Karma test 2014-07-31 22:49:11 -03:00
Yemel Jardi 9c633f1918 Add icons for user actions at transaction proposal 2014-07-31 20:34:21 -03:00
Gustavo Maximiliano Cortez dc565e0a68 Integrating ZeroClipboard in Copay as directive 2014-07-31 16:34:21 -03:00
Yemel Jardi fdabdc64fe Add a pre-generated address to the shared branch 2014-07-31 16:13:27 -03:00
Yemel Jardi e5fd3c38f4 Fix open external in new tab and fix typo 2014-07-31 14:06:55 -03:00
Gustavo Maximiliano Cortez f704826a5c feature: Logout wallet after 15 minutes of inactivity 2014-07-30 20:12:22 -03:00
Matias Alejo Garcia d62883e88f Merge pull request #969 from yemel/feature/address-external-link 
Open bitcoin url in external app
 2014-07-30 09:55:33 -03:00
Yemel Jardi 45f4352ec4 Add qr code to wallet secret and qr scanner at join page 2014-07-30 02:55:59 -03:00
Yemel Jardi 037b6e9d01 Open bitcoin url in external app 2014-07-30 00:51:38 -03:00
Yemel Jardi 71448828f2 Fix settings save function 2014-07-30 00:22:40 -03:00
Gustavo Maximiliano Cortez fc339f6472 Merge pull request #964 from matiu/feature/renameHD 
Feature/rename hd
 2014-07-29 15:57:48 -03:00
Yemel Jardi ba70a17b63 Fix uriHandler 2014-07-29 15:30:01 -03:00
Matias Alejo Garcia af2a12929a fix uriPayment 2014-07-29 14:30:08 -03:00
Yemel Jardi e3eeab0eb6 Change routes to old hastag mode 2014-07-29 14:13:21 -03:00
Matias Alejo Garcia ba31e6a628 renames inside HDParams 2014-07-29 14:11:11 -03:00
Matias Alejo Garcia 578d05e638 all tests BUT hardcoded imports working 2014-07-29 13:09:47 -03:00
Matias Alejo Garcia 0ee93403f3 change names to HD and fix HD* tests 2014-07-29 11:23:58 -03:00
Matias Alejo Garcia 1a40e29fd2 remove unrequired soop 2014-07-29 10:21:44 -03:00
Matias Alejo Garcia 19b9fcd0b1 change to camelCase 2014-07-29 10:14:43 -03:00
Matias Alejo Garcia 1d5238b2b8 change to camelCase 2014-07-29 10:14:15 -03:00
Gustavo Maximiliano Cortez 8974847f48 Removed old unused notifications. Fixes template url for new notifications 2014-07-28 15:41:12 -03:00
Gustavo Maximiliano Cortez 898e5a12ef Fixes: karma tests 2014-07-28 13:30:41 -03:00
Gustavo Maximiliano Cortez 85aa5842f1 Fix Conflicts: 
.gitignore
	index.html
	js/controllers/backup.js
	js/controllers/sidebar.js
 2014-07-28 12:28:07 -03:00
Manuel Aráoz 811dc6dd3b Merge pull request #952 from matiu/feature/txproposal01 
Feature/txproposal01
 2014-07-25 18:05:02 -03:00
Matias Alejo Garcia ceada149d7 fix tests 2014-07-25 17:48:35 -03:00
Matias Alejo Garcia 3aef6e156b add FORCED options to TxBuilder creation 2014-07-25 17:45:56 -03:00
Matias Alejo Garcia eea45d4413 reset note in form 2014-07-25 17:45:06 -03:00
Matias Alejo Garcia 560702df58 Merge pull request #936 from yemel/feature/android-cordova 
Android - Migration to Cordova + Crosswalk Framework
 2014-07-25 16:40:13 -03:00
Manuel Araoz e85431861e fix cases for incomplete transactions 2014-07-25 13:37:12 -03:00
Manuel Araoz 76e0d8f5ef add validation for actual tx SIGHASH_TYPE 2014-07-25 12:25:28 -03:00
Manuel Araoz b5c144d48c complete validation tests for txProposal SIGHASH 2014-07-25 12:25:27 -03:00
Manuel Aráoz d7650f30ff Merge pull request #929 from matiu/feature/bitcore01 
Updates model and tests to newest bitcore version
 2014-07-25 12:23:36 -03:00
Matias Alejo Garcia bb5ba1a209 rm log 2014-07-25 12:15:00 -03:00
Matias Alejo Garcia 2008db932b add buildermockv0 to show old / obsolete tx proposals 2014-07-25 11:59:13 -03:00
Yemel Jardi 19f57e614c Add native QR scanner to send form 2014-07-25 11:30:54 -03:00
Yemel Jardi e121d0acb6 Send email backup with file attached 2014-07-25 11:30:54 -03:00
Matias Alejo Garcia 7f11793b96 less strict import check for TXP v0 2014-07-25 11:13:48 -03:00
Matias Alejo Garcia ae08d5611a fix test / id name 2014-07-25 11:05:10 -03:00
Matias Alejo Garcia ab0aee7e89 Merge pull request #2 from maraoz/feature/bitcore01 
add failing test for mati to fix
 2014-07-25 10:53:46 -03:00
Manuel Araoz 235920bd84 add failing test for mati to fix 2014-07-25 10:50:18 -03:00
Matias Alejo Garcia 5eb8164df2 skip incompatible transaction proposals from backups 2014-07-25 10:39:41 -03:00