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

1970 Commits

Author SHA1 Message Date
Christopher Jeffrey b0dc3fc24d paypro: more merchant data storage. createTx and sendTx work. 2014-08-14 09:52:08 -04:00
Christopher Jeffrey d7ec908701 paypro: remove old code. 2014-08-14 09:52:08 -04:00
Christopher Jeffrey 61ef19ad19 paypro: fix a lot of aspects of storing merchant data in txps. 2014-08-14 09:52:08 -04:00
Christopher Jeffrey 59038a5d30 paypro: fix how merchant data is stored. 2014-08-14 09:52:08 -04:00
Christopher Jeffrey d7b1770e5a paypro: add merchant prop to tx proposal. 2014-08-14 09:52:08 -04:00
Christopher Jeffrey ebf3137946 paypro: rework flow of payment protocol. 2014-08-14 09:52:08 -04:00
Christopher Jeffrey 6c098030c3 paypro: fix trusted check. 2014-08-14 09:52:08 -04:00
Christopher Jeffrey f49177f0b7 paypro: begin adding code for payment protocol. 2014-08-14 09:52:08 -04:00
Matias Alejo Garcia ef2035d70a Merge pull request #1085 from greggzigler/try_catch 
replace try/catch with browserify for copay.js
 2014-08-13 18:16:48 -04:00
Gregg Zigler 5853a197e5 replace try/catch with browserify for copay.js 2014-08-13 15:04:55 -07:00
Yemel Jardi 815c98f7e8 Merge pull request #1076 from matiu/bug/02-open-wallet 
Bug/02 open wallet
 2014-08-13 12:33:46 -03:00
Matias Alejo Garcia 33ac84bc49 rm logs 2014-08-13 10:16:07 -04:00
Matias Alejo Garcia c4b854e91e Merge pull request #1077 from davbritt/patch-1 
Update README.md
 2014-08-12 16:12:22 -04:00
David 92659961fa Update README.md 2014-08-12 21:54:13 +02:00
Matias Alejo Garcia 35ab711846 refactor lock warning and add tests 2014-08-12 15:26:15 -04:00
Yemel Jardi 59e12d569a Merge pull request #1068 from bechi/bugs/sidebar 
Bugs/sidebar
 2014-08-12 10:15:13 -03:00
Yemel Jardi 92bc7f7e4d Merge pull request #1067 from bechi/bugs/scan-button 
fix scan button
 2014-08-12 10:02:08 -03:00
Yemel Jardi 7d5e4b4a49 Merge pull request #1073 from matiu/bug/settings 
fix settings page and add tests
 2014-08-12 10:01:16 -03:00
Matias Alejo Garcia 1733f5491b fix settings page and add tests 2014-08-11 16:26:48 -04:00
bechi 21a32c213c add tooltips 2014-08-11 10:15:24 -03:00
bechi 41ee5edfc0 fix left bar 2014-08-08 11:22:12 -03:00
bechi 86e4c0cea9 fix scann button 2014-08-08 10:36:25 -03:00
Gustavo Maximiliano Cortez fb3a7191e5 Updated mocha test 2014-08-07 20:40:39 -03:00
Gustavo Maximiliano Cortez 8ad1fa7b02 Fixes: tests. Added karma and mocha tests. 2014-08-07 20:07:41 -03:00
Gustavo Maximiliano Cortez 801e746d11 Show a warning if trying to open same wallet in same browser. Fix redirect to receive. 2014-08-07 18:57:19 -03:00
Gustavo Maximiliano Cortez fe53f1b87c Merge pull request #1059 from yemel/feature/change-menu 
Refactor menu, split transactions tab into send and history
 2014-08-07 10:26:40 -03:00
Yemel Jardi 17a66f7ad7 update karma tests 2014-08-07 10:20:24 -03:00
Yemel Jardi 09e60b2f70 Refresh tx list after send on 1-of-1 2014-08-07 09:53:20 -03:00
Matias Alejo Garcia bb9406be01 Merge pull request #1033 from cmgustavo/bug/01-url-handler 
Fixes: url handler
 2014-08-07 00:58:08 -03:00
Matias Alejo Garcia 35f379f8c8 Merge pull request #1042 from yemel/feature/add-limit-feedback 
WIP: Add comment about #copayers and #signatures limits
 2014-08-07 00:57:11 -03:00
Matias Alejo Garcia 1a5d28fb50 Merge pull request #1063 from greggzigler/JSHint 
Add TxProposals to mocha test page, apply some jshint error corrections
 2014-08-07 00:56:10 -03:00
Gregg Zigler c8c7a57416 1. Add TxProposals to mocha test page 
2. The jshint tool found some instances where var was declared twice within a function. Seemed to originate from copy/paste-style coding. Most were unambiguously intended for a single block within the function. In a few cases, two declarations were consumed by one later reference. In those cases, I removed the duplicate var or I refactored slightly.
 2014-08-06 18:44:04 -04:00
Gustavo Maximiliano Cortez fd030ecbfb Fix Conflicts: 
js/controllers/join.js
 2014-08-06 18:55:44 -03:00
Gustavo Maximiliano Cortez 0c2141c380 Fix Conflicts: 
views/unsupported.html
 2014-08-06 18:51:04 -03:00
Matias Alejo Garcia 8e2802e1e7 Merge pull request #1064 from cmgustavo/feature/01-setup 
add steps to creation process
 2014-08-06 18:45:26 -03:00
Gustavo Maximiliano Cortez 53bc610bbc improve url checker 2014-08-06 18:41:37 -03:00
Matias Alejo Garcia 0ca9bbe86b Merge pull request #1062 from cmgustavo/feature/01-delete 
Add delete wallet from the intermediate screen
 2014-08-06 18:38:23 -03:00
Matias Alejo Garcia cc164af28b Merge pull request #1045 from cmgustavo/feature/01-version 
Feature/01 version
 2014-08-06 18:34:03 -03:00
Gustavo Maximiliano Cortez c588d97fc3 add steps to creation process 2014-08-06 18:21:14 -03:00
Manuel Aráoz 569417e4a1 Merge pull request #1001 from matiu/feature/txproposals/checks10 
Refactor Transaction Proposals
 2014-08-06 16:59:29 -03:00
Gustavo Maximiliano Cortez e264aa66a2 Add delete wallet from the intermediate screen (it was lost in migration to new design) 2014-08-06 16:51:45 -03:00
Matias Alejo Garcia ddc8649bd3 fix `comment` handling 2014-08-06 15:56:17 -03:00
Gustavo Maximiliano Cortez 7fd642c8ac Fixes problem with gitignore 2014-08-06 15:36:13 -03:00
Yemel Jardi 2ba794fc47 Change url to /receive and /history 2014-08-06 15:34:56 -03:00
Matias Alejo Garcia afde77e575 fix last transaction retrieval 2014-08-06 15:30:47 -03:00
Yemel Jardi e9b2381511 Merge pull request #1057 from bechi/feature/steps 
add steps img
 2014-08-06 15:09:30 -03:00
Yemel Jardi b715c9c46d Merge pull request #1046 from bechi/bugs/scann-wallet-secret 
fix scann wallet secret
 2014-08-06 15:06:09 -03:00
Yemel Jardi ad75265e93 Refactor menu, split transactions tab into send and history 2014-08-06 13:59:33 -03:00
bechi f93f7b7424 add steps img 2014-08-06 12:33:23 -03:00
Matias Alejo Garcia 91a05a896e rm removeRepeated fn 2014-08-05 17:18:02 -03:00